From 630bf109bb3a924e90804cce697b29f2a90d9bd8 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 7 Apr 2009 23:50:56 +0000 Subject: [PATCH] Merged revisions 186832 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r186832 | mmichelson | 2009-04-07 18:49:49 -0500 (Tue, 07 Apr 2009) | 8 lines 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/trunk@186833 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main/channel.c b/main/channel.c index 718677b392..9da0c59935 100644 --- a/main/channel.c +++ b/main/channel.c @@ -5260,6 +5260,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: ast_verb(3, "Native bridging %s and %s ended\n", c0->name, c1->name);