brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Handle forced Xwayland shutdown elegantly

Browse Source 
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>
This commit is contained in:
Carlos Garnacho 2021-01-20 16:55:08 +01:00
parent 9c71e208bd
commit 5671888775
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wayland/meta-xwayland.c
View File

@ -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");