From: Christian Richter <christian.richter@beronet.com>
Date: Thu, 24 May 2007 09:51:01 +0000 (+0000)
Subject: Merged revisions 65768 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2601
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e03f5a8e882c0cd6e2a44c723b30741671f13213;p=thirdparty%2Fasterisk.git

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

................
r65768 | crichter | 2007-05-24 11:37:32 +0200 (Do, 24 Mai 2007) | 9 lines

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

........
r65767 | crichter | 2007-05-24 11:19:58 +0200 (Do, 24 Mai 2007) | 1 line

we should only activate the generator in chan_misdn, when asterisk hask not yet taken the call (WAITING4DIGS state). Alerting audio will be generated fomr asterisk for example.
........

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


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

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 72a6129f6a..14c241f700 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -2936,6 +2936,8 @@ static int stop_indicate(struct chan_list *cl)
 	chan_misdn_log(3,cl->bc->port," --> None\n");
 	misdn_lib_tone_generator_stop(cl->bc);
 	ast_playtones_stop(ast);
+
+	cl->ts=NULL;
 	/*ast_deactivate_generator(ast);*/
 	
 	return 0;