From 094d8954cb646622696b4f773d2540e57a6caa32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 15 Jan 2024 14:39:59 +0100
Subject: [PATCH] closeDialog: Close existing dialogs on shutdown

Otherwise mutter will request to hide the dialog when the meta
context is destroyed, but at the JS context has already shut down,
resulting in a crash.

Close https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/7328

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3117>
(cherry picked from commit 17b71621214cb694641807f66a6449651823b2b6)
---
 js/ui/closeDialog.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/ui/closeDialog.js b/js/ui/closeDialog.js
index ace93b8f0..0e5aad121 100644
--- a/js/ui/closeDialog.js
+++ b/js/ui/closeDialog.js
@@ -162,6 +162,9 @@ var CloseDialog = GObject.registerClass({
         this._addWindowEffect();
         this._initDialog();
 
+        global.connectObject(
+            'shutdown', () => this._onWait(), this._dialog);
+
         this._dialog._dialog.scale_y = 0;
         this._dialog._dialog.set_pivot_point(0.5, 0.5);