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

xwayland: Unset shutdown idle id when source removed by callback

Browse Source 
We failed to do this when the experimental "auto-close Xwayland" setting
was not enabled.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1796>
This commit is contained in:
Jonas Ådahl 2021-03-23 17:25:48 +01:00
parent 1dd79c52ad
commit 257ccf5e80
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -597,7 +597,10 @@ shutdown_xwayland_cb (gpointer data)
if (!meta_settings_is_experimental_feature_enabled (meta_backend_get_settings (backend), if (!meta_settings_is_experimental_feature_enabled (meta_backend_get_settings (backend),
META_EXPERIMENTAL_FEATURE_AUTOCLOSE_XWAYLAND)) META_EXPERIMENTAL_FEATURE_AUTOCLOSE_XWAYLAND))
return G_SOURCE_REMOVE; {
manager->xserver_grace_period_id = 0;
return G_SOURCE_REMOVE;
}
if (display->x11_display && if (display->x11_display &&
!can_terminate_xwayland (display->x11_display->xdisplay)) !can_terminate_xwayland (display->x11_display->xdisplay))