[svn-commits] rmudgett: trunk r392140 - /trunk/main/bridging.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Jun 18 11:09:15 2013
New Revision: 392140

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=392140
Log:
Add some safety cleanup for a failed push into a bridge.

Modified:
    trunk/main/bridging.c

Modified: trunk/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridging.c?view=diff&rev=392140&r1=392139&r2=392140
==============================================================================
--- trunk/main/bridging.c (original)
+++ trunk/main/bridging.c Tue Jun 18 11:09:15 2013
@@ -651,6 +651,7 @@
 		|| ast_bridge_channel_establish_roles(bridge_channel)) {
 		ast_debug(1, "Bridge %s: pushing %p(%s) into bridge failed\n",
 			bridge->uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan));
+		bridge_features_remove(bridge_channel->features, AST_BRIDGE_HOOK_REMOVE_ON_PULL);
 		return -1;
 	}
 	bridge_channel->in_bridge = 1;