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

desktop-shell: Migrate surface_unlink_view

Browse Source 
Moving weston_desktop_surface_unlink_view() to
desktop_shell_destroy_surface() makes sure we don't leak the underlying
weston_desktop_view when tearing/shutting down the compositor.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
(cherry picked from commit c41cdcabb4)
This commit is contained in:
Marius Vlad
2022-05-05 15:32:27 +03:00
parent 1d95c0992b
commit 8c9dff0146
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
@@ -267,6 +267,7 @@ desktop_shell_destroy_surface(struct shell_surface *shsurf)
wl_list_init(&shsurf_child->children_link); wl_list_init(&shsurf_child->children_link);
} }
wl_list_remove(&shsurf->children_link); wl_list_remove(&shsurf->children_link);
weston_desktop_surface_unlink_view(shsurf->view);
wl_signal_emit(&shsurf->destroy_signal, shsurf); wl_signal_emit(&shsurf->destroy_signal, shsurf);
weston_surface_destroy(shsurf->wsurface_anim_fade); weston_surface_destroy(shsurf->wsurface_anim_fade);
@@ -2370,7 +2371,6 @@ 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_unlink_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) {