From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 6 Aug 2015 23:57:59 +0000 (-0500)
Subject: destroy personal canvas after member is out of the list
X-Git-Tag: v1.6.2~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3c248048eaded74ddefdd9fad955dbefd86c001;p=thirdparty%2Ffreeswitch.git

destroy personal canvas after member is out of the list
---

diff --git a/src/mod/applications/mod_conference/conference_member.c b/src/mod/applications/mod_conference/conference_member.c
index 7862156ae6..28134d1358 100644
--- a/src/mod/applications/mod_conference/conference_member.c
+++ b/src/mod/applications/mod_conference/conference_member.c
@@ -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);