From 021876711ff51935e0636281882191cb016629de Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Tue, 18 Apr 2006 14:43:32 +0000
Subject: [PATCH] Do not depend on having an end sound for stopping the bridge
when time runs out. (issue #6979 reported by ppyy)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21130 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channel.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/channel.c b/channel.c
index 230aa13d6e..769f2dc31c 100644
--- 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)
--
GitLab