summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2017-08-11 17:06:01 -0500
committerRichard Mudgett <rmudgett@digium.com>2017-08-22 11:26:09 -0500
commit87c7a1c79cc9ff061d9d4bbdc116976ba59904bf (patch)
tree6a482456f859d598bf18698ba7e76964b03af2cc /bridges
parentc86619bab87d348cbcd2f3378e4b68c8cb20090b (diff)
bridge_softmix.c: Restored softmix_bridge_leave() shortcut exit.
Change-Id: I13026cd90954e0265eab94a0faf635a3e11f0e35
Diffstat (limited to 'bridges')
-rw-r--r--bridges/bridge_softmix.c8
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,