]> 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)
committerMike Jerris <mike@jerris.com>
Tue, 7 Mar 2017 18:53:15 +0000 (12:53 -0600)
src/mod/applications/mod_conference/conference_video.c

index 9f273366deb5c3215f6599ca82374a61c0871efd..02ba0d02bc1b7a8d7bde570bb227e81836889827 100644 (file)
@@ -2575,16 +2575,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,