From e401f725d1fd947595e1cfcf75b6f35e4e47de8b Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Mon, 25 Nov 2019 12:55:27 +0000 Subject: [PATCH] parking: Fall back to parker channel name even if it matches parkee. ASTERISK-28631 Change-Id: Ia74d084799fbb9bee3403e30d2391aacd46243cc --- res/parking/parking_bridge.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/res/parking/parking_bridge.c b/res/parking/parking_bridge.c index 981ef813cf..4e56d58d5a 100644 --- a/res/parking/parking_bridge.c +++ b/res/parking/parking_bridge.c @@ -274,10 +274,15 @@ static int bridge_parking_push(struct ast_bridge_parking *self, struct ast_bridg blind_transfer = ast_strdupa(S_OR(blind_transfer, "")); ast_channel_unlock(bridge_channel->chan); if (!parker || !strcmp(parker->name, ast_channel_name(bridge_channel->chan))) { - /* Even if there is no BLINDTRANSFER dialplan variable then blind_transfer will - * be an empty string. - */ - parker_channel_name = blind_transfer; + if (ast_strlen_zero(blind_transfer) && parker) { + /* If no BLINDTRANSFER exists but the parker does then use their channel name */ + parker_channel_name = parker->name; + } else { + /* Even if there is no BLINDTRANSFER dialplan variable then blind_transfer will + * be an empty string. + */ + parker_channel_name = blind_transfer; + } } else { parker_channel_name = parker->name; } -- 2.47.2