Do not depend on having an end sound for stopping the bridge when time runs out....
authorJoshua Colp <jcolp@digium.com>
Tue, 18 Apr 2006 14:43:32 +0000 (14:43 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 18 Apr 2006 14:43:32 +0000 (14:43 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21130 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channel.c

index 230aa13..769f2dc 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)