isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

windowManager: listen actively to windows being destroyed during WS switch

Browse Source 
Prevents gjs from dealing with already dispose()d objects.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/539

(cherry-picked from b087752b55)
This commit is contained in:
Carlos Garnacho 2018-09-06 21:50:21 +02:00 committed by Marco Trevisan (Treviño)
parent 4c7b20e584
commit 09fbb4a127
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/windowManager.js
View File

@ -1763,6 +1763,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.set_position(-xDest, -yDest);
switchData.inGroup.raise_top(); switchData.inGroup.raise_top();
@ -1793,8 +1801,8 @@ var WindowManager = new Lang.Class({
for (let i = 0; i < switchData.windows.length; i++) { for (let i = 0; i < switchData.windows.length; i++) {
let w = switchData.windows[i]; let w = switchData.windows[i];
if (w.window.is_destroyed()) // Window gone w.window.disconnect(w.windowDestroyId);
continue;
if (w.window.get_parent() == switchData.outGroup) { if (w.window.get_parent() == switchData.outGroup) {
w.window.reparent(w.parent); w.window.reparent(w.parent);
w.window.hide(); w.window.hide();