don't reset when video floor is locked

when video floor is locked by a member, changing audio floor on del_member
will cause the video floor lock cleared unexpectedly, this commit fixes that.

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 406aa14b9549e3253cefcc043996a5696577e76c..c431f11286ca55b21346ff991fbf6d609811752b 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -2531,7 +2531,7 @@ static void conference_set_floor_holder(conference_obj_t *conference, conference
        int old_id = 0;
 
        if (!switch_test_flag(conference, CFLAG_VIDEO_BRIDGE) && 
-               ((conference->video_floor_holder && !member) ||
+               ((conference->video_floor_holder && !member && !switch_test_flag(conference, CFLAG_VID_FLOOR_LOCK)) ||
                        (member && member->channel && switch_channel_test_flag(member->channel, CF_VIDEO)))) {
                conference_set_video_floor_holder(conference, member, SWITCH_FALSE);
        }