[mutter] xwayland: Unset shutdown idle id when source removed by callback

[Marge Bot <marge-bot src gnome org>]

commit 257ccf5e80b845ff5efd3cb579a25310581c7da8
Author: Jonas Ådahl <jadahl gmail com>
Date:   Tue Mar 23 17:25:48 2021 +0100

    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>

 src/wayland/meta-xwayland.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index 1a79c9434c..54bb614b01 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))