[svn-commits] trunk r21130 - /trunk/channel.c

[svn-commits at lists.digium.com]

Author: file
Date: Tue Apr 18 09:43:32 2006
New Revision: 21130

URL: http://svn.digium.com/view/asterisk?rev=21130&view=rev
Log:
Do not depend on having an end sound for stopping the bridge when time runs out. (issue #6979 reported by ppyy)

Modified:
    trunk/channel.c

Modified: trunk/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/channel.c?rev=21130&r1=21129&r2=21130&view=diff
==============================================================================
--- trunk/channel.c (original)
+++ trunk/channel.c Tue Apr 18 09:43:32 2006
@@ -3461,10 +3461,10 @@
 			if (time_left_ms < to)
 				to = time_left_ms;
 
-			if (time_left_ms <= 0 && config->end_sound) {
-				if (caller_warning)
+			if (time_left_ms <= 0) {
+				if (caller_warning && config->end_sound)
 					bridge_playfile(c0, c1, config->end_sound, 0);
-				if (callee_warning)
+				if (callee_warning && config->end_sound)
 					bridge_playfile(c1, c0, config->end_sound, 0);
 				*fo = NULL;
 				if (who)