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 bc51f5e0009582ffe2143287d6f1b3341c685359..454037cfba2b8f42749db83658a7106d3c5598dd 100644 (file)
--- 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;
        }