diff options
author | Joshua Colp <jcolp@digium.com> | 2006-04-18 14:43:32 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2006-04-18 14:43:32 +0000 |
commit | 021876711ff51935e0636281882191cb016629de (patch) | |
tree | 562331f963b0d6e7c26177ebc40e101068c21cb0 /channel.c | |
parent | 910c44b1b63f0ebef7464c9a6d39aff16d515dd9 (diff) |
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
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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) |