From 729c7fa788822e5b0561f992d040e1bb8781cbaf Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Tue, 16 Aug 2016 10:28:21 +0200 Subject: [PATCH] desktop-shell: Properly destroy the weston_desktop_view MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Quentin Glidic Reviewed-by: Jonas Ådahl --- desktop-shell/shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 786020b4..8023b0da 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -2364,6 +2364,7 @@ desktop_surface_removed(struct weston_desktop_surface *desktop_surface, 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 @@ desktop_surface_removed(struct weston_desktop_surface *desktop_surface, 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); }