diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-08-23 12:43:47 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-08-23 12:43:47 -0500 |
| commit | be8d32f635b9d71e4710f2ca5b28b4d508dc0bbf (patch) | |
| tree | b81b5a4276cd26d875bcc1d78f53641254bfe88d | |
| parent | 391af170681317fe0c6dc5e01fa675fc910380f6 (diff) | |
| parent | b5987fa191dfa7e6134a5cd537d861faaa403ab0 (diff) | |
Merge "bridge_softmix.c: Restored softmix_bridge_leave() shortcut exit." into 15
| -rw-r--r-- | bridges/bridge_softmix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index b9a0e98ad..2d71fc37c 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -786,17 +786,17 @@ static void softmix_bridge_leave(struct ast_bridge *bridge, struct ast_bridge_ch { struct softmix_channel *sc; struct softmix_bridge_data *softmix_data; + softmix_data = bridge->tech_pvt; sc = bridge_channel->tech_pvt; + if (!sc) { + return; + } if (bridge->softmix.video_mode.mode == AST_BRIDGE_VIDEO_MODE_SFU) { sfu_topologies_on_leave(bridge_channel, &bridge->channels); } - if (!sc) { - return; - } - if (bridge->softmix.binaural_active) { if (sc->binaural) { set_binaural_data_leave(&softmix_data->convolve, sc->binaural_pos, |