From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 14 Apr 2017 23:57:48 +0000 (-0500)
Subject: FS-10225: [mod_conference] Incorrect layout chosen when playing a file in a conferenc... 
X-Git-Tag: v1.8.0~602
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db285ed58174adc309210533ca379181f057b3f8;p=thirdparty%2Ffreeswitch.git

FS-10225: [mod_conference] Incorrect layout chosen when playing a file in a conference with a layout group -- revert small piece
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 6de8049067..cc9d36ea69 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -2932,7 +2932,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++;