Add some safety cleanup for a failed push into a bridge.
authorRichard Mudgett <rmudgett@digium.com>
Tue, 18 Jun 2013 16:09:15 +0000 (16:09 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Tue, 18 Jun 2013 16:09:15 +0000 (16:09 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392140 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/bridging.c

index 93e4ec2..ffe2161 100644 (file)
@@ -651,6 +651,7 @@ static int bridge_channel_push(struct ast_bridge_channel *bridge_channel)
                || 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;