FS-8663 cont

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index c8121d74ecf22dca5349b2ec93cbb5c3c25993eb..15f8b13836962ffc906718388ec03f7db73c34cb 100644 (file)
--- 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);