From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 28 Nov 2017 20:14:15 +0000 (-0600)
Subject: FS-10802: [mod_conference] Convert conference floor to id based
X-Git-Tag: v1.8.1~3^2~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57daad7af89c556254618fab144c015f0c5cdfa8;p=thirdparty%2Ffreeswitch.git

FS-10802: [mod_conference] Convert conference floor to id based
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 547e88c326..50da2bc350 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -1353,6 +1353,10 @@ switch_status_t conference_video_attach_video_layer(conference_member_t *member,
 		return SWITCH_STATUS_FALSE;
 	}
 
+	if (!zstr(member->video_role_id) && !zstr(layer->geometry.role_id) && !strcmp(layer->geometry.role_id, member->video_role_id)) {
+		conference_utils_member_set_flag(member, MFLAG_DED_VID_LAYER);
+	}
+
 	if (conference_utils_member_test_flag(member, MFLAG_DED_VID_LAYER)) {
 		if (member->id == member->conference->floor_holder) {
 			conference_member_set_floor_holder(member->conference, NULL, 0);