From 2ebecc5370eb61668feff2fd8742891ca40f30fc Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 19 Nov 2013 19:27:04 -0500 Subject: [PATCH] wayland-surface: Allow extension resources to be double-destroyed As they will be on shutdown... I'm not sure if this is a wayland-server bug or not, but we should guard against it anyway. --- src/wayland/meta-wayland-surface.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c index 317f4fb75..ebcd9642e 100644 --- a/src/wayland/meta-wayland-surface.c +++ b/src/wayland/meta-wayland-surface.c @@ -478,6 +478,10 @@ static void destroy_surface_extension (struct wl_resource *resource) { MetaWaylandSurfaceExtension *extension = wl_resource_get_user_data (resource); + + if (extension->resource == NULL) + return; + wl_list_remove (&extension->surface_destroy_listener.link); extension->surface_destroy_listener.notify = NULL; extension->resource = NULL;