From 567188877562c6aeb89cc82c7338cf53eedd8982 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Wed, 20 Jan 2021 16:55:08 +0100 Subject: [PATCH] wayland: Handle forced Xwayland shutdown elegantly In the shutdown paths we check with the X11 display whether there's remaining clients. However this happens in paths that happen after the MetaX11Display vanished in the case of Xwayland crash. Since in that situation the clients are forcibly vanishing too, skip the client check. Part-of: --- src/wayland/meta-xwayland.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c index b11b32b3e..53017c357 100644 --- a/src/wayland/meta-xwayland.c +++ b/src/wayland/meta-xwayland.c @@ -535,7 +535,8 @@ shutdown_xwayland_cb (gpointer data) META_EXPERIMENTAL_FEATURE_AUTOCLOSE_XWAYLAND)) return G_SOURCE_REMOVE; - if (!can_terminate_xwayland (display->x11_display->xdisplay)) + if (display->x11_display && + !can_terminate_xwayland (display->x11_display->xdisplay)) return G_SOURCE_CONTINUE; meta_verbose ("Shutting down Xwayland");