Do not depend on having an end sound for stopping the bridge when time runs out....

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

diff --git a/channel.c b/channel.c
index 230aa13d6e4517cb188b3bbe397b608b2bb7185e..769f2dc31c64c30ae75bcdc15c43959048961b40 100644 (file)
--- a/channel.c
+++ b/channel.c
@@ -3461,10 +3461,10 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
                        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)