[asterisk-commits] oej: trunk r101153 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Wed Jan 30 05:21:52 2008
New Revision: 101153

URL: http://svn.digium.com/view/asterisk?view=rev&rev=101153
Log:
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)


........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=101153&r1=101152&r2=101153
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Jan 30 05:21:52 2008
@@ -15430,7 +15430,9 @@
 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);
 	}
 }