From: Joshua Colp <jcolp@digium.com>
Date: Mon, 30 Nov 2009 16:29:29 +0000 (+0000)
Subject: Fix a bug where an immediate masquerade would cause a queued unhold frame to get... 
X-Git-Tag: 11.0.0-beta1~3823
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28b009b2667b1b1b02749d58f7c508b6c37f0f20;p=thirdparty%2Fasterisk.git

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
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index bb5e495672..e7b6cebb3d 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);