[gnome-shell/wip/rstrode/rhel-7.9: 55/86] windowManager: listen actively to windows being destroyed during WS switch

[Ray Strode <halfline src gnome org>]

commit 924a9e2d9a98377063d5073e9a3d61ec1863f425
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Sep 6 21:50:21 2018 +0200

    windowManager: listen actively to windows being destroyed during WS switch
    
    Prevents gjs from dealing with already dispose()d objects.
    
    Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/539
    
    (cherry-picked from b087752b5539a8cbb1d61979cb069aef8a3475be)

 js/ui/windowManager.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 3fda973f13..a9c0d0c174 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -1760,6 +1760,14 @@ var WindowManager = new Lang.Class({
             }
         }
 
+        for (let i = 0; i < switchData.windows.length; i++) {
+            let w = switchData.windows[i];
+
+            w.windowDestroyId = w.window.connect('destroy', () => {
+                switchData.windows.splice(switchData.windows.indexOf(w), 1);
+            });
+        }
+
         switchData.inGroup.set_position(-xDest, -yDest);
         switchData.inGroup.raise_top();
 
@@ -1790,8 +1798,8 @@ var WindowManager = new Lang.Class({
 
         for (let i = 0; i < switchData.windows.length; i++) {
                 let w = switchData.windows[i];
-                if (w.window.is_destroyed()) // Window gone
-                    continue;
+                w.window.disconnect(w.windowDestroyId);
+
                 if (w.window.get_parent() == switchData.outGroup) {
                     w.window.reparent(w.parent);
                     w.window.hide();