From d3d1ff1aae6e876fc4fac58f5a09f580e7418566 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 24 May 2019 23:27:40 +0200 Subject: [PATCH] x11: Do not queue stack operation for guard window In the case mutter is a x11 compositor, it doesn't matter much since the stack tracker will go away soon. In the case this is a wayland compositor with mandatory Xwayland, it matters even less since the session would be shutting down in those paths. But if this a wayland compositor that can start Xwayland on demand, this is even harmful, as the MetaStackTracker should be cleared of x11 windows at this moment, and we actually did right before dispose on ::x11-display-closing. https://gitlab.gnome.org/GNOME/mutter/merge_requests/709 --- src/x11/meta-x11-display.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c index def878d2c..6f20797e6 100644 --- a/src/x11/meta-x11-display.c +++ b/src/x11/meta-x11-display.c @@ -182,21 +182,8 @@ meta_x11_display_dispose (GObject *object) if (x11_display->guard_window != None) { - MetaStackTracker *stack_tracker = x11_display->display->stack_tracker; - - if (stack_tracker) - { - unsigned long serial; - - serial = XNextRequest (x11_display->xdisplay); - meta_stack_tracker_record_remove (stack_tracker, - x11_display->guard_window, - serial); - } - XUnmapWindow (x11_display->xdisplay, x11_display->guard_window); XDestroyWindow (x11_display->xdisplay, x11_display->guard_window); - x11_display->guard_window = None; }