From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 7 Apr 2009 23:49:49 +0000 (+0000)
Subject: Set the AST_FEATURE_WARNING_ACTIVE flag when a p2p bridge returns AST_BRIDGE_RETRY.
X-Git-Tag: 1.4.25-rc1~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8cdf25ccba610ae4026d4c553d80636c5bad44b;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.4@186832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/channel.c b/main/channel.c
index 32e5bf2cb7..bfe3183bdd 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)