commit 729c7fa788822e5b0561f992d040e1bb8781cbaf
author Quentin Glidic <sardemff7+git@sardemff7.net> Tue Aug 16 10:28:21 2016 +0200
committer Quentin Glidic <sardemff7+git@sardemff7.net> Tue Aug 16 10:59:33 2016 +0200
tree b94e339a337c930646a3c08d1ee1d6056a9a9a7c
parent 154c5d23041cb51973dc07689ab195759e2b59df

desktop-shell: Properly destroy the weston_desktop_view

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>

desktop-shell/shell.c

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 786020b..8023b0d 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -2364,6 +2364,7 @@
 	weston_desktop_surface_set_user_data(shsurf->desktop_surface, NULL);
 	shsurf->desktop_surface = NULL;
 
+	weston_desktop_surface_destroy_view(shsurf->view);
 	if (weston_surface_is_mapped(surface) &&
 	    shsurf->shell->win_close_animation_type == ANIMATION_FADE) {
 		pixman_region32_fini(&surface->pending.input);
@@ -2373,7 +2374,6 @@
 		weston_fade_run(shsurf->view, 1.0, 0.0, 300.0,
 				fade_out_done, shsurf);
 	} else {
-		weston_desktop_surface_destroy_view(shsurf->view);
 		weston_view_destroy(shsurf->view);
 		free(shsurf);
 	}