From 039e9be49d25615d43d1197c54fc08e3f17794b3 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Tue, 14 Apr 2015 17:09:06 -0500 Subject: [PATCH] desktop-shell: destroy surfaces in an idle handler after fade out It's possible for more than one animation to be taking place on a view at the same time. If one of those animations is the shell's fade out for dying surfaces, its completion handler will trigger the surface destroy signal, causing other animations on the animation list to remove themselves. Since this removal occurs during the linked list walk, the compositor may crash. We move the actual surface destruction into an idle handler to avoid this. Signed-off-by: Derek Foreman Reviewed-by: Pekka Paalanen Tested-by: Pekka Paalanen --- desktop-shell/shell.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 452cd5fd..8c37963a 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -177,6 +177,8 @@ struct shell_surface { bool has_set_geometry, has_next_geometry; int focus_count; + + bool destroying; }; struct shell_grab { @@ -3575,13 +3577,28 @@ shell_handle_surface_destroy(struct wl_listener *listener, void *data) } static void -fade_out_done(struct weston_view_animation *animation, void *data) +fade_out_done_idle_cb(void *data) { struct shell_surface *shsurf = data; weston_surface_destroy(shsurf->surface); } +static void +fade_out_done(struct weston_view_animation *animation, void *data) +{ + struct shell_surface *shsurf = data; + struct wl_event_loop *loop; + + loop = wl_display_get_event_loop( + shsurf->surface->compositor->wl_display); + + if (!shsurf->destroying) { + wl_event_loop_add_idle(loop, fade_out_done_idle_cb, shsurf); + shsurf->destroying = true; + } +} + static void handle_resource_destroy(struct wl_listener *listener, void *data) {