From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 20 Apr 2017 21:41:53 +0000 (-0500)
Subject: FS-10225: [mod_conference] Incorrect layout chosen when playing a file in a conferenc... 
X-Git-Tag: v1.6.18~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47af36ff83f76e73e0cd90e9f151e0438270b992;p=thirdparty%2Ffreeswitch.git

FS-10225: [mod_conference] Incorrect layout chosen when playing a file in a conference with a layout group -- fix regression when playing files into a group layout
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 33bd991db4..605f9f9f9c 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -1403,7 +1403,7 @@ video_layout_t *conference_video_find_best_layout(conference_obj_t *conference,
 			break;
 		}
 
-		if (vlnode->vlayout->layers - file_layers >= (int)count) {
+		if (vlnode->vlayout->layers - file_layers >= (int)count + file_count) {
 			if (!least || least->vlayout->layers > vlnode->vlayout->layers) {
 				least = vlnode;
 			}