From be5fdb57c5f277275be3f3a2f8d3595069a490d5 Mon Sep 17 00:00:00 2001 From: Piroska Gabor Date: Tue, 28 Apr 2020 14:32:36 +0200 Subject: [PATCH] Set the CFLAG_VID_FLOOR_LOCK before the floor would taken by the member to prevent the floor state from being stolen. --- src/mod/applications/mod_conference/conference_member.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mod/applications/mod_conference/conference_member.c b/src/mod/applications/mod_conference/conference_member.c index 4eebd7a37e..0c2aa59838 100644 --- a/src/mod/applications/mod_conference/conference_member.c +++ b/src/mod/applications/mod_conference/conference_member.c @@ -1059,9 +1059,8 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m if (conference_utils_member_test_flag(member, MFLAG_JOIN_VID_FLOOR)) { - conference_video_set_floor_holder(conference, member, SWITCH_TRUE); conference_utils_set_flag(member->conference, CFLAG_VID_FLOOR_LOCK); - + conference_video_set_floor_holder(conference, member, SWITCH_TRUE); if (test_eflag(conference, EFLAG_FLOOR_CHANGE)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "conference %s OK video floor %d %s\n", conference->name, member->id, switch_channel_get_name(member->channel));