From f78007766b628b36f4c8af74a60688817c040467 Mon Sep 17 00:00:00 2001 From: Seven Du Date: Tue, 16 Sep 2014 19:13:32 +0800 Subject: [PATCH] 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. --- src/mod/applications/mod_conference/mod_conference.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 406aa14b95..c431f11286 100644 --- 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); }