From 8a753a4f42693a54a163158727470827471eb6b6 Mon Sep 17 00:00:00 2001 From: Brian West Date: Thu, 27 Aug 2009 16:43:55 +0000 Subject: [PATCH] fix reaction in att_xfer when call is cancelled or times out git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14650 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_ivr_originate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c index 1893f8b456..1e14935c70 100644 --- a/src/switch_ivr_originate.c +++ b/src/switch_ivr_originate.c @@ -1893,7 +1893,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess switch_dtmf_t dtmf = { 0, 0 }; if (switch_channel_dequeue_dtmf(caller_channel, &dtmf) == SWITCH_STATUS_SUCCESS) { if (dtmf.digit == *cancel_key) { - oglobals.idx = IDX_TIMEOUT; + oglobals.idx = IDX_CANCEL; goto notready; } } @@ -2014,10 +2014,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess if (switch_channel_up(originate_status[i].peer_channel)) { if (caller_channel && i == 0) { holding = switch_channel_get_variable(caller_channel, SWITCH_HOLDING_UUID_VARIABLE); - holding = switch_core_session_strdup(oglobals.session, holding); switch_channel_set_variable(caller_channel, SWITCH_HOLDING_UUID_VARIABLE, NULL); } - if (holding) { + if (holding && oglobals.idx != IDX_TIMEOUT && oglobals.idx != IDX_CANCEL) { switch_ivr_uuid_bridge(holding, switch_core_session_get_uuid(originate_status[i].peer_session)); } else { switch_channel_hangup(originate_status[i].peer_channel, reason);