From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 18 Nov 2015 19:37:52 +0000 (-0600)
Subject: FS-8545 do not allow video floor on a member with a reservation id set
X-Git-Tag: v1.6.5~5^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb8d4a2b999943bc837fb6c32a09664cfafc5329;p=thirdparty%2Ffreeswitch.git

FS-8545 do not allow video floor on a member with a reservation id set
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index bc51f5e000..454037cfba 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -3218,6 +3218,11 @@ void conference_video_set_floor_holder(conference_obj_t *conference, conference_
 		conference_utils_clear_flag(conference, CFLAG_VID_FLOOR_LOCK);
 	}
 
+	if (member && member->video_reservation_id) {
+		/* no video floor when a reservation id is set */
+		return;
+	}
+
 	if ((!force && conference_utils_test_flag(conference, CFLAG_VID_FLOOR_LOCK))) {
 		return;
 	}