kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Anthony Minessale 2015-11-18 13:37:52 -06:00
parent 420a78afc4
commit fb8d4a2b99
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mod/applications/mod_conference/conference_video.c
View File

@ -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;
}