[asterisk-commits] mmichelson: trunk r186833 - in /trunk: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Apr  7 18:50:56 2009
New Revision: 186833

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=186833
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/channel.c?view=diff&rev=186833&r1=186832&r2=186833
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue Apr  7 18:50:56 2009
@@ -5260,6 +5260,9 @@
 			}
 			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);