Merge "bridge_softmix.c: Restored softmix_bridge_leave() shortcut exit."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Wed, 23 Aug 2017 17:21:47 +0000 (12:21 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 23 Aug 2017 17:21:47 +0000 (12:21 -0500)
bridges/bridge_softmix.c

index b9a0e98..2d71fc3 100644 (file)
@@ -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,