[asterisk-commits] crichter: trunk r65343 - in /trunk: ./ channels/chan_misdn.c

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Tue May 22 03:21:59 2007
New Revision: 65343

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65343
Log:
Merged revisions 65342 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r65342 | crichter | 2007-05-22 10:12:20 +0200 (Di, 22 Mai 2007) | 9 lines

Merged revisions 65328 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r65328 | crichter | 2007-05-22 09:46:39 +0200 (Di, 22 Mai 2007) | 1 line

we stop the tones only when we're in the pre-call phase, otherwise e.g. when in CONNECTED state we should not stop tones when we receive an Information Message
........

................

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

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

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=65343&r1=65342&r2=65343
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Tue May 22 03:21:59 2007
@@ -3900,7 +3900,8 @@
 	{
 		int stop_tone;
 		misdn_cfg_get( 0, MISDN_GEN_STOP_TONE, &stop_tone, sizeof(int));
-		if ( stop_tone ) {
+
+		if ( (ch->state != MISDN_CONNECTED) && stop_tone ) {
 			stop_indicate(ch);
 		}