summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2013-06-18 16:09:15 +0000
committerRichard Mudgett <rmudgett@digium.com>2013-06-18 16:09:15 +0000
commite943dc8de37e4af4c6fe49d100e1dc1e8323a48d (patch)
tree0541402fa902c71f0d38d199318f2a18aa00b73c /main
parent73854ebb2bcde41b226ea7b93701d1872eebb15e (diff)
Add some safety cleanup for a failed push into a bridge.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392140 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/bridging.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/bridging.c b/main/bridging.c
index 93e4ec2d8..ffe216116 100644
--- a/main/bridging.c
+++ b/main/bridging.c
@@ -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;