From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 12 Apr 2017 17:39:45 +0000 (-0500)
Subject: FS-10225: [mod_conference] Incorrect layout chosen when playing a file in a conferenc... 
X-Git-Tag: v1.8.0~613
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d66090148731c733749e3ca2c1e45c8ed2d723d;p=thirdparty%2Ffreeswitch.git

FS-10225: [mod_conference] Incorrect layout chosen when playing a file in a conference with a layout group Don't change layout when playing full-screen anyway
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 044d38f65f..7236785fef 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -2983,6 +2983,9 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 			do_refresh = 100;
 		}
 
+		if (canvas->playing_video_file) {
+			file_count = 0;
+		}
 
 		if (file_count != last_file_count) {
 			count_changed = 1;