]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7513: more floor stuff
authorAnthony Minessale <anthm@freeswitch.org>
Sat, 24 Jan 2015 07:53:34 +0000 (01:53 -0600)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:46:54 +0000 (12:46 -0500)
src/mod/applications/mod_conference/mod_conference.c

index 454fe3cd24904d5cf22d8340c12752326376e58e..1d4a477744546389628aa6e5857d8f5f286e85c8 100644 (file)
@@ -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;
+       }
 }