From b99a2a2ff07c99edf5ee65124923ed14d3ded809 Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 7 Apr 2009 23:52:17 +0000
Subject: [PATCH] Merged revisions 186833 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
  r186833 | mmichelson | 2009-04-07 18:50:56 -0500 (Tue, 07 Apr 2009) | 15 lines

  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/branches/1.6.2@186836 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 b492f51131..f570ea70b4 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -4886,6 +4886,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);