diff options
author | Richard Mudgett <rmudgett@digium.com> | 2017-08-11 17:06:01 -0500 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2017-08-22 11:25:32 -0500 |
commit | b5987fa191dfa7e6134a5cd537d861faaa403ab0 (patch) | |
tree | 8faaeb19755849df9bac72f81c4408d2ba8c97aa /bridges | |
parent | b7c27e1c84c430093961439e5d2a955a9c4f7d81 (diff) |
bridge_softmix.c: Restored softmix_bridge_leave() shortcut exit.
Change-Id: I13026cd90954e0265eab94a0faf635a3e11f0e35
Diffstat (limited to 'bridges')
-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 b35994895..f11de6d3c 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, |