From e79a24ed2b73b1c5a5e539ac5a92185af92b6407 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Sat, 24 Jan 2015 01:53:34 -0600 Subject: [PATCH] FS-7513: more floor stuff --- src/mod/applications/mod_conference/mod_conference.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 454fe3cd24..1d4a477744 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -2208,6 +2208,7 @@ static void find_video_floor(conference_member_t *member, switch_bool_t entering conference_member_t *imember; conference_obj_t *conference = member->conference; + if (!entering) { if (member->id == conference->video_floor_holder) { conference_set_video_floor_holder(conference, NULL, 1); @@ -2246,9 +2247,11 @@ static void find_video_floor(conference_member_t *member, switch_bool_t entering } } - switch_mutex_unlock(conference->member_mutex); + if (conference->last_video_floor_holder == conference->video_floor_holder) { + conference->last_video_floor_holder = 0; + } }