diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-07 23:50:56 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-07 23:50:56 +0000 |
| commit | 683b53c339047c6d565797f4c9349a55bf003db1 (patch) | |
| tree | cbba3137bac4200db86ae6740a18508c76664d73 /main/channel.c | |
| parent | d0aadc491085d286758b60d739c67cd9bb13dd09 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@186833 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c index 718677b39..9da0c5993 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); |