summaryrefslogtreecommitdiff
path: root/main/bridging.c
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2013-07-03 22:07:25 +0000
committerRichard Mudgett <rmudgett@digium.com>2013-07-03 22:07:25 +0000
commitad5dc3c159081d792b879b1bc29935cc79cc09b0 (patch)
tree41a82c21caeb8e9efa2ef29f8feca765798dede1 /main/bridging.c
parentb96d8cbc78b8dac8c9783c6bdd00650cd913d333 (diff)
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
Diffstat (limited to 'main/bridging.c')
-rw-r--r--main/bridging.c4
1 files changed, 1 insertions, 3 deletions
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);