From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 11 Aug 2017 22:06:01 +0000 (-0500)
Subject: bridge_softmix.c: Restored softmix_bridge_leave() shortcut exit.
X-Git-Tag: 16.0.0-rc1~861^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87c7a1c79cc9ff061d9d4bbdc116976ba59904bf;p=thirdparty%2Fasterisk.git

bridge_softmix.c: Restored softmix_bridge_leave() shortcut exit.

Change-Id: I13026cd90954e0265eab94a0faf635a3e11f0e35
---

diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index b35994895e..f11de6d3c0 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,