mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
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
This commit is contained in:
@@ -710,12 +710,10 @@ static int bridge_channel_push(struct ast_bridge_channel *bridge_channel)
|
|||||||
bridge_channel->just_joined = 1;
|
bridge_channel->just_joined = 1;
|
||||||
AST_LIST_INSERT_TAIL(&bridge->channels, bridge_channel, entry);
|
AST_LIST_INSERT_TAIL(&bridge->channels, bridge_channel, entry);
|
||||||
++bridge->num_channels;
|
++bridge->num_channels;
|
||||||
|
|
||||||
ast_bridge_publish_enter(bridge, bridge_channel->chan);
|
|
||||||
|
|
||||||
if (!bridge_channel->suspended) {
|
if (!bridge_channel->suspended) {
|
||||||
++bridge->num_active;
|
++bridge->num_active;
|
||||||
}
|
}
|
||||||
|
ast_bridge_publish_enter(bridge, bridge_channel->chan);
|
||||||
if (swap) {
|
if (swap) {
|
||||||
ast_bridge_change_state(swap, AST_BRIDGE_CHANNEL_STATE_HANGUP);
|
ast_bridge_change_state(swap, AST_BRIDGE_CHANNEL_STATE_HANGUP);
|
||||||
bridge_channel_pull(swap);
|
bridge_channel_pull(swap);
|
||||||
|
Reference in New Issue
Block a user