summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Glidic <sardemff7+git@sardemff7.net>2016-08-16 10:28:21 +0200
committerQuentin Glidic <sardemff7+git@sardemff7.net>2016-08-16 10:59:33 +0200
commit729c7fa788822e5b0561f992d040e1bb8781cbaf (patch)
treeb94e339a337c930646a3c08d1ee1d6056a9a9a7c
parent154c5d23041cb51973dc07689ab195759e2b59df (diff)
desktop-shell: Properly destroy the weston_desktop_view
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net> Reviewed-by: Jonas Ã…dahl <jadahl@gmail.com>
-rw-r--r--desktop-shell/shell.c2
1 files changed, 1 insertions, 1 deletions
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);
}