[asterisk-commits] bridge softmix.c: Restored softmix bridge leave() shortcut e... (asterisk[15])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/6267 )

Change subject: bridge_softmix.c: Restored softmix_bridge_leave() shortcut exit.
......................................................................

bridge_softmix.c: Restored softmix_bridge_leave() shortcut exit.

Change-Id: I13026cd90954e0265eab94a0faf635a3e11f0e35
---
M bridges/bridge_softmix.c
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Sean Bright: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved; Approved for Submit



diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index b359948..f11de6d 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -786,15 +786,15 @@
 {
 	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) {

-- 
To view, visit https://gerrit.asterisk.org/6267
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: merged
Gerrit-Change-Id: I13026cd90954e0265eab94a0faf635a3e11f0e35
Gerrit-Change-Number: 6267
Gerrit-PatchSet: 1
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Sean Bright <sean.bright at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-commits/attachments/20170823/45b4003c/attachment-0001.html>