From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 13 May 2015 19:42:26 +0000 (-0500)
Subject: FS-7513 favor moderators for selection of open layers in the canvas
X-Git-Tag: v1.6.2~614^2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e141d0e518411b0af4943e6799df257a679066d;p=thirdparty%2Ffreeswitch.git

FS-7513 favor moderators for selection of open layers in the canvas
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index ac218a7c27..6232bd7f15 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -2056,13 +2056,14 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
 			for (i = 0; i < conference->canvas->total_layers; i++) {
 				mcu_layer_t *xlayer = &conference->canvas->layers[i];
 					
-				if (xlayer->is_avatar && xlayer->member_id != conference->video_floor_holder) {
+				if (xlayer->is_avatar && xlayer->member_id != conference->video_floor_holder && !switch_test_flag(imember, MFLAG_MOD)) {
 					avatar_layers++;
 				}
 			}
 
-			if (!layer && (conference->canvas->layers_used < conference->canvas->total_layers || 
-						   (avatar_layers && !imember->avatar_png_img)) && 
+			if (!layer && 
+				(conference->canvas->layers_used < conference->canvas->total_layers || 
+				 (avatar_layers && !imember->avatar_png_img) || switch_test_flag(imember, MFLAG_MOD)) &&
 				(imember->avatar_png_img || imember->video_flow != SWITCH_MEDIA_FLOW_SENDONLY)) {
 				/* find an empty layer */
 				for (i = 0; i < conference->canvas->total_layers; i++) {