[svn-commits] crichter: trunk r65769 - in /trunk: ./ channels/chan_misdn.c

[svn-commits at lists.digium.com]

Author: crichter
Date: Thu May 24 04:51:01 2007
New Revision: 65769

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

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

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=65769&r1=65768&r2=65769
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Thu May 24 04:51:01 2007
@@ -2936,6 +2936,8 @@
 	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;