]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
destroy personal canvas after member is out of the list
authorAnthony Minessale <anthm@freeswitch.org>
Thu, 6 Aug 2015 23:57:59 +0000 (18:57 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Thu, 6 Aug 2015 23:57:59 +0000 (18:57 -0500)
src/mod/applications/mod_conference/conference_member.c

index 7862156ae6c2299172b63500345d9ea32cc1a6cf..28134d1358dc12e12e347fbea629c7555edd69c6 100644 (file)
@@ -1055,10 +1055,6 @@ switch_status_t conference_member_del(conference_obj_t *conference, conference_m
        }
 #endif
 
-       if (member->canvas) {
-               conference_video_destroy_canvas(&member->canvas);
-       }
-
        member_fnode = member->fnode;
        member_sh = member->sh;
        member->fnode = NULL;
@@ -1182,6 +1178,10 @@ switch_status_t conference_member_del(conference_obj_t *conference, conference_m
        conference_video_find_floor(member, SWITCH_FALSE);
        conference_video_detach_video_layer(member);
 
+       if (member->canvas) {
+               conference_video_destroy_canvas(&member->canvas);
+       }
+
        member->conference = NULL;
 
        switch_mutex_unlock(conference->member_mutex);