From 3afa404d65954aed2c250fdf47dbe1cb06bef330 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 14 Apr 2017 18:57:48 -0500 Subject: [PATCH] FS-10225: [mod_conference] Incorrect layout chosen when playing a file in a conference with a layout group -- revert small piece --- src/mod/applications/mod_conference/conference_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index 7f217b7d98..2e2131cb1b 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -2379,7 +2379,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr int seen = conference_utils_member_test_flag(imember, MFLAG_CAN_BE_SEEN); if (imember->channel && switch_channel_ready(imember->channel) && switch_channel_test_flag(imember->channel, CF_VIDEO_READY) && - !conference_utils_member_test_flag(imember, MFLAG_SECOND_SCREEN) && imember->video_layer_id > -1 && + !conference_utils_member_test_flag(imember, MFLAG_SECOND_SCREEN) && conference_utils_member_test_flag(imember, MFLAG_RUNNING) && (!no_muted || seen) && (!no_av || (no_av && !imember->avatar_png_img)) && imember->canvas_id == canvas->canvas_id && imember->video_media_flow != SWITCH_MEDIA_FLOW_SENDONLY && imember->video_media_flow != SWITCH_MEDIA_FLOW_INACTIVE) { video_count++;