[asterisk-commits] dlee: branch dlee/ASTERISK-22296 r397700 - in /team/dlee/ASTERISK-22296: ./ m...

[SVN commits to the Asterisk project]

Author: dlee
Date: Mon Aug 26 22:37:41 2013
New Revision: 397700

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397700
Log:
Merged revisions 397690 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    team/dlee/ASTERISK-22296/   (props changed)
    team/dlee/ASTERISK-22296/main/bridge_channel.c

Propchange: team/dlee/ASTERISK-22296/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 26 22:37:41 2013
@@ -1,1 +1,1 @@
-/branches/12:1-397673
+/branches/12:1-397699

Modified: team/dlee/ASTERISK-22296/main/bridge_channel.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-22296/main/bridge_channel.c?view=diff&rev=397700&r1=397699&r2=397700
==============================================================================
--- team/dlee/ASTERISK-22296/main/bridge_channel.c (original)
+++ team/dlee/ASTERISK-22296/main/bridge_channel.c Mon Aug 26 22:37:41 2013
@@ -1527,8 +1527,9 @@
 	 * outgoing channel, clear the outgoing flag.
 	 */
 	if (ast_test_flag(ast_channel_flags(bridge_channel->chan), AST_FLAG_OUTGOING)
-			&& (ast_channel_softhangup_internal_flag(bridge_channel->chan) &
-				(AST_SOFTHANGUP_ASYNCGOTO | AST_SOFTHANGUP_UNBRIDGE))) {
+			&& (ast_channel_softhangup_internal_flag(bridge_channel->chan) & (AST_SOFTHANGUP_ASYNCGOTO | AST_SOFTHANGUP_UNBRIDGE)
+			    || bridge_channel->state == BRIDGE_CHANNEL_STATE_WAIT)) {
+		ast_debug(2, "Channel %s will survive this bridge; clearing outgoing (dialed) flag\n", ast_channel_name(bridge_channel->chan));
 		ast_clear_flag(ast_channel_flags(bridge_channel->chan), AST_FLAG_OUTGOING);
 	}