From 05d15f8885404934dc46d04c73c4d95e99435f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Fri, 21 Apr 2017 17:40:25 +0800 Subject: [PATCH] window/wayland: Don't try to resize window on tear down When terminating mutter running as a display server, don't try to resize maximized windows when unmanaging, as at this point, they will have no MetaWaylandSurface. Originally this was done instead of setting the net_wm_state to not mess with future window managers, but when we're a Wayland compositor, this does not matter. https://bugzilla.gnome.org/show_bug.cgi?id=782156 --- src/core/window.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/window.c b/src/core/window.c index 8f5f52fe1..a7b91e001 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -2955,7 +2955,11 @@ unmaximize_window_before_freeing (MetaWindow *window) window->rect = window->saved_rect; set_net_wm_state (window); } - else if (window->screen->closing) /* See bug #358042 */ + else if (window->screen->closing /* See bug #358042 */ +#ifdef HAVE_WAYLAND + && !meta_is_wayland_compositor () +#endif + ) { /* Do NOT update net_wm_state: this screen is closing, * it likely will be managed by another window manager