From ad5dc3c159081d792b879b1bc29935cc79cc09b0 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Wed, 3 Jul 2013 22:07:25 +0000 Subject: Move when bridge channel enter is published so it does not interrupt the thought of some lines of code. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@393601 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/bridging.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'main') diff --git a/main/bridging.c b/main/bridging.c index dc84c41ce..110f5255b 100644 --- a/main/bridging.c +++ b/main/bridging.c @@ -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); -- cgit v1.2.3