aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-04-07 23:49:49 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-04-07 23:49:49 +0000
commita9ea6aee046fbdb998f6c6595fef889a12e6c38d (patch)
tree8e532e5c58b1adb9a858b6a61b74e669f6a2fa9a /main
parentdfbead24ff85eb07a9da1789f2c4c2838eedb4c3 (diff)
Set the AST_FEATURE_WARNING_ACTIVE flag when a p2p bridge returns AST_BRIDGE_RETRY.
Without this flag set, warning sounds will not be properly played to either party of the bridge. (closes issue #14845) Reported by: adomjan git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@186832 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/channel.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c
index 32e5bf2cb..bfe3183bd 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -4293,6 +4293,9 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
}
switch (res) {
case AST_BRIDGE_RETRY:
+ if (config->play_warning) {
+ ast_set_flag(config, AST_FEATURE_WARNING_ACTIVE);
+ }
continue;
default:
if (option_verbose > 2)