From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 23 Mar 2016 13:45:30 +0000 (-0500)
Subject: FS-7800 disable video floor changes on multi canvas
X-Git-Tag: v1.6.7^2~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72e3462118187e1bfcf20bdcd0a3170c93a404ad;p=thirdparty%2Ffreeswitch.git

FS-7800 disable video floor changes on multi canvas
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 87a0d24b93..5c638c5b89 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -2407,7 +2407,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 			}
 
 			//VIDFLOOR
-			if (canvas->layout_floor_id > -1 && imember->id == conference->video_floor_holder &&
+			if (conference->canvas_count == 1 && canvas->layout_floor_id > -1 && imember->id == conference->video_floor_holder &&
 				imember->video_layer_id != canvas->layout_floor_id) {
 				conference_video_attach_video_layer(imember, canvas, canvas->layout_floor_id);
 			}
@@ -3464,6 +3464,10 @@ void conference_video_set_floor_holder(conference_obj_t *conference, conference_
 		conference_utils_clear_flag(conference, CFLAG_VID_FLOOR_LOCK);
 	}
 
+	if (conference->canvas_count > 1) {
+		return;
+	}
+
 	if (member && member->video_reservation_id) {
 		/* no video floor when a reservation id is set */
 		return;