]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-10091: [mod_conference] Conference play file with full-screen=true has side effect...
authorAnthony Minessale <anthm@freeswitch.org>
Fri, 3 Mar 2017 23:35:03 +0000 (17:35 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Fri, 3 Mar 2017 23:35:03 +0000 (17:35 -0600)
src/mod/applications/mod_conference/conference_video.c

index faf662e09168169410b1669dd6309ce4dbb475bf..e6e03ffa5e4d790deea953bc0302ae16c018d22e 100644 (file)
@@ -2696,16 +2696,15 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                                conference_video_attach_video_layer(imember, canvas, canvas->layout_floor_id);
                        }
 
-                       conference_video_pop_next_image(imember, &img);
-                       layer = NULL;
-
-
                        if (conference->playing_video_file) {
                                switch_img_free(&img);
                                switch_core_session_rwunlock(imember->session);
                                continue;
                        }
 
+                       conference_video_pop_next_image(imember, &img);
+                       layer = NULL;
+
                        switch_mutex_lock(canvas->mutex);
 
                        //printf("MEMBER %d layer_id %d canvas: %d/%d\n", imember->id, imember->video_layer_id,