diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2021-01-20 16:55:08 +0100 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2021-01-20 16:55:08 +0100 |
| commit | 567188877562c6aeb89cc82c7338cf53eedd8982 (patch) | |
| tree | 64de85256383a6b8bec9846adfcad1d36e591d6a /src/wayland/meta-xwayland.c | |
| parent | 9c71e208bd1f2184251b654c4b7501a00c46dc4d (diff) | |
| download | mutter-567188877562c6aeb89cc82c7338cf53eedd8982.tar.gz | |
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: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1677>
Diffstat (limited to 'src/wayland/meta-xwayland.c')
| -rw-r--r-- | src/wayland/meta-xwayland.c | 3 |
1 files changed, 2 insertions, 1 deletions
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"); |