From e4ee40d7ff6603241907d96c082550e32f7e02fa Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Wed, 18 Jan 2023 22:45:10 +0100 Subject: [PATCH] compositor: Wrap x11 surface actor destruction in error trap This does a number of X11 calls. For what it might happen, better wrap these in error traps. Part-of: --- src/compositor/meta-surface-actor-x11.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/compositor/meta-surface-actor-x11.c b/src/compositor/meta-surface-actor-x11.c index df19a5c22..8fba241a6 100644 --- a/src/compositor/meta-surface-actor-x11.c +++ b/src/compositor/meta-surface-actor-x11.c @@ -311,8 +311,12 @@ meta_surface_actor_x11_is_unredirected (MetaSurfaceActorX11 *self) static void release_x11_resources (MetaSurfaceActorX11 *self) { + MetaX11Display *x11_display = meta_display_get_x11_display (self->display); + + meta_x11_error_trap_push (x11_display); detach_pixmap (self); free_damage (self); + meta_x11_error_trap_pop (x11_display); } static void