Merged revisions 65342 via svnmerge from
authorChristian Richter <christian.richter@beronet.com>
Tue, 22 May 2007 08:21:59 +0000 (08:21 +0000)
committerChristian Richter <christian.richter@beronet.com>
Tue, 22 May 2007 08:21:59 +0000 (08:21 +0000)
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
........

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

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

channels/chan_misdn.c

index e777a46..72a6129 100644 (file)
@@ -3900,7 +3900,8 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
        {
                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);
                }