diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2021-03-23 17:25:48 +0100 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2021-10-26 16:55:12 +0200 |
| commit | 257ccf5e80b845ff5efd3cb579a25310581c7da8 (patch) | |
| tree | bffc8988aa3e09da8804aa7a9ad592b60b47c022 /src/wayland/meta-xwayland.c | |
| parent | 1dd79c52ad51b9a68b50642dffd55e391358b2f3 (diff) | |
| download | mutter-257ccf5e80b845ff5efd3cb579a25310581c7da8.tar.gz | |
xwayland: Unset shutdown idle id when source removed by callback
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>
Diffstat (limited to 'src/wayland/meta-xwayland.c')
| -rw-r--r-- | src/wayland/meta-xwayland.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c index 1a79c9434..54bb614b0 100644 --- a/src/wayland/meta-xwayland.c +++ b/src/wayland/meta-xwayland.c @@ -597,7 +597,10 @@ shutdown_xwayland_cb (gpointer data) if (!meta_settings_is_experimental_feature_enabled (meta_backend_get_settings (backend), META_EXPERIMENTAL_FEATURE_AUTOCLOSE_XWAYLAND)) - return G_SOURCE_REMOVE; + { + manager->xserver_grace_period_id = 0; + return G_SOURCE_REMOVE; + } if (display->x11_display && !can_terminate_xwayland (display->x11_display->xdisplay)) |