From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 3 Mar 2017 23:35:03 +0000 (-0600)
Subject: FS-10091: [mod_conference] Conference play file with full-screen=true has side effect... 
X-Git-Tag: v1.6.16~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a81a4c6abe3b2933dd5de2ba63341e836d57f615;p=thirdparty%2Ffreeswitch.git

FS-10091: [mod_conference] Conference play file with full-screen=true has side effect on member video #resolve
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 9f273366de..02ba0d02bc 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -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,