From fb8d4a2b999943bc837fb6c32a09664cfafc5329 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 18 Nov 2015 13:37:52 -0600 Subject: [PATCH] FS-8545 do not allow video floor on a member with a reservation id set --- src/mod/applications/mod_conference/conference_video.c | 5 +++++ 1 file changed, 5 insertions(+) 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; }