mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-29 18:19:30 +00:00
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
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user