Move when bridge channel enter is published so it does not interrupt the thought...
authorRichard Mudgett <rmudgett@digium.com>
Wed, 3 Jul 2013 22:07:25 +0000 (22:07 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Wed, 3 Jul 2013 22:07:25 +0000 (22:07 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@393601 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/bridging.c

index dc84c41..110f525 100644 (file)
@@ -710,12 +710,10 @@ static int bridge_channel_push(struct ast_bridge_channel *bridge_channel)
        bridge_channel->just_joined = 1;
        AST_LIST_INSERT_TAIL(&bridge->channels, bridge_channel, entry);
        ++bridge->num_channels;
-
-       ast_bridge_publish_enter(bridge, bridge_channel->chan);
-
        if (!bridge_channel->suspended) {
                ++bridge->num_active;
        }
+       ast_bridge_publish_enter(bridge, bridge_channel->chan);
        if (swap) {
                ast_bridge_change_state(swap, AST_BRIDGE_CHANNEL_STATE_HANGUP);
                bridge_channel_pull(swap);