From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 18 Mar 2016 02:09:30 +0000 (-0500)
Subject: FS-8663 cont
X-Git-Tag: v1.6.7^2~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29447feadfad8f89ad4b02eb576ea6a6b5da9dbe;p=thirdparty%2Ffreeswitch.git

FS-8663 cont
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index c8121d74ec..15f8b13836 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -2541,22 +2541,24 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 			
 			for (imember = conference->members; imember; imember = imember->next) {
 
-				if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO_READY) || !imember->canvas ||
+				if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO_READY) ||
 					switch_core_session_read_lock(imember->session) != SWITCH_STATUS_SUCCESS) {
 					continue;
 				}
 
-				if (conference->new_personal_vlayout) {
-					conference_video_init_canvas_layers(conference, imember->canvas, conference->new_personal_vlayout);
-					layout_applied++;
-				}
-
 				if (!imember->canvas) {
 					if ((vlayout = conference_video_get_layout(conference, conference->video_layout_name, conference->video_layout_group))) {
 						conference_video_init_canvas(conference, vlayout, &imember->canvas);
 						conference_video_init_canvas_layers(conference, imember->canvas, vlayout);
+					} else {
+						continue;
 					}
 				}
+
+				if (conference->new_personal_vlayout) {
+					conference_video_init_canvas_layers(conference, imember->canvas, conference->new_personal_vlayout);
+					layout_applied++;
+				}
 				
 				if (switch_channel_test_flag(imember->channel, CF_VIDEO_REFRESH_REQ)) {
 					switch_channel_clear_flag(imember->channel, CF_VIDEO_REFRESH_REQ);