summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2009-11-30 16:29:29 +0000
committerJoshua Colp <jcolp@digium.com>2009-11-30 16:29:29 +0000
commit28b009b2667b1b1b02749d58f7c508b6c37f0f20 (patch)
treee6b28f08b1ca31329a665cdb078d44e1b0d45e39 /channels
parent0a4942633b35cdbbfad260dcf33c8fe684bf78fd (diff)
Fix a bug where an immediate masquerade would cause a queued unhold frame to get lost. Now we just
indicate unhold directly after the masquerade is complete. (issue ABE-2011) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@231436 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index bb5e49567..e7b6cebb3 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -21531,6 +21531,8 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
ast_channel_lock(transferer); /* the transferer pvt is expected to remain locked on return */
+ ast_indicate(target.chan1, AST_CONTROL_UNHOLD);
+
if (target.chan2) {
ast_channel_queue_connected_line_update(target.chan1, &connected_to_transferee);
ast_channel_queue_connected_line_update(target.chan2, &connected_to_target);