From: Olle Johansson <oej@edvina.net>
Date: Wed, 30 Jan 2008 11:21:52 +0000 (+0000)
Subject: Merged revisions 101152 via svnmerge from
X-Git-Tag: 1.6.0-beta3~2^2~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85b2ef5f0eb1b040e1eb5da897626f730fb9ccfc;p=thirdparty%2Fasterisk.git

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

........
r101152 | oej | 2008-01-30 12:20:31 +0100 (Ons, 30 Jan 2008) | 7 lines

Stop musiconhold on attended transfer.
(closes issue #11872)
Reported by: gareth
Patches:
      svn-101018.patch uploaded by gareth (license 208)


........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 919dd358ba..d6f4a05af0 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -15430,7 +15430,9 @@ static int sip_park(struct ast_channel *chan1, struct ast_channel *chan2, struct
 static void ast_quiet_chan(struct ast_channel *chan) 
 {
 	if (chan && chan->_state == AST_STATE_UP) {
-		if (chan->generatordata)
+		if (ast_test_flag(chan, AST_FLAG_MOH))
+			ast_moh_stop(chan);
+		else if (chan->generatordata)
 			ast_deactivate_generator(chan);
 	}
 }