diff options
| -rw-r--r-- | res/parking/parking_applications.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/res/parking/parking_applications.c b/res/parking/parking_applications.c index 22ae9c448..733c943ab 100644 --- a/res/parking/parking_applications.c +++ b/res/parking/parking_applications.c @@ -349,15 +349,21 @@ static int setup_park_common_datastore(struct ast_channel *parkee, const char *p attended_transfer = pbx_builtin_getvar_helper(parkee, "ATTENDEDTRANSFER"); blind_transfer = pbx_builtin_getvar_helper(parkee, "BLINDTRANSFER"); - if (attended_transfer || blind_transfer) { - parker_dial_string = ast_strdupa(S_OR(attended_transfer, blind_transfer)); + if (!ast_strlen_zero(attended_transfer)) { + parker_dial_string = ast_strdupa(attended_transfer); + } else if (!ast_strlen_zero(blind_transfer)) { + parker_dial_string = ast_strdupa(blind_transfer); + /* Ensure that attended_transfer is NULL and not an empty string. */ + attended_transfer = NULL; } ast_channel_unlock(parkee); if (!ast_strlen_zero(parker_dial_string)) { ast_channel_name_to_dial_string(parker_dial_string); - ast_verb(4, "Setting Parker dial string to %s from %s value", parker_dial_string, attended_transfer ? "ATTENDEDTRANSFER" : "BLINDTRANSFER"); + ast_verb(4, "Setting Parker dial string to %s from %s value\n", + parker_dial_string, + attended_transfer ? "ATTENDEDTRANSFER" : "BLINDTRANSFER"); park_datastore->parker_dial_string = ast_strdup(parker_dial_string); } |