From: Terry Wilson <twilson@digium.com>
Date: Wed, 18 May 2011 23:15:58 +0000 (+0000)
Subject: Merged revisions 319653 via svnmerge from
X-Git-Tag: 1.8.5-rc1~11^2~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35a3aa4601bbcf06795e267c8687884f9b185520;p=thirdparty%2Fasterisk.git

Merged revisions 319653 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r319653 | twilson | 2011-05-18 16:11:57 -0700 (Wed, 18 May 2011) | 15 lines

  Merged revisions 319652 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r319652 | twilson | 2011-05-18 16:04:35 -0700 (Wed, 18 May 2011) | 8 lines

    Make sure everyone gets an unhold when a transfer succeeds

    Some phones, like the Snom phones, send a hold to the transfer target after
    before sending the REFER. We need to make sure that we unhold the parties
    that are being connected after the masquerade. If Local channels with the /nm
    option are used when dialing the parties, hold music would still be playing on
    the transfer target, even after being connected with the transferee.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@319654 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9d0ea32b64..001c3b5db3 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -22333,6 +22333,9 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
 		sip_pvt_lock(transferer); /* the transferer pvt is expected to remain locked on return */
 
 		ast_indicate(target.chan1, AST_CONTROL_UNHOLD);
+		if (target.chan2) {
+			ast_indicate(target.chan2, AST_CONTROL_UNHOLD);
+		}
 
 		if (current->chan2 && current->chan2->_state == AST_STATE_RING) {
 			ast_indicate(target.chan1, AST_CONTROL_RINGING);