mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desktop-shell: Properly destroy the weston_desktop_view

Browse Source 
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
This commit is contained in:
Quentin Glidic
2016-08-16 10:28:21 +02:00
parent 154c5d2304
commit 729c7fa788
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/shell.c
+1 -1
View File
@@ -2364,6 +2364,7 @@ desktop_surface_removed(struct weston_desktop_surface *desktop_surface,
weston_desktop_surface_set_user_data(shsurf->desktop_surface, NULL); weston_desktop_surface_set_user_data(shsurf->desktop_surface, NULL);
shsurf->desktop_surface = NULL; shsurf->desktop_surface = NULL;
weston_desktop_surface_destroy_view(shsurf->view);
if (weston_surface_is_mapped(surface) && if (weston_surface_is_mapped(surface) &&
shsurf->shell->win_close_animation_type == ANIMATION_FADE) { shsurf->shell->win_close_animation_type == ANIMATION_FADE) {
pixman_region32_fini(&surface->pending.input); 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, weston_fade_run(shsurf->view, 1.0, 0.0, 300.0,
fade_out_done, shsurf); fade_out_done, shsurf);
} else { } else {
weston_desktop_surface_destroy_view(shsurf->view);
weston_view_destroy(shsurf->view); weston_view_destroy(shsurf->view);
free(shsurf); free(shsurf);
} }