safe overview handlers disconnection

hardpixel · Mar 24, 2018 · be90111 · be90111
1 parent c2e229b
commit be90111
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/[email protected]/helpers.js b/[email protected]/helpers.js
@@ -68,6 +68,18 @@ function collectWindowButtons(layout_items) {
   return items;
 }
 
+function overviewSignals(handlers) {
+  let signals = [];
+
+  Main.overview._signalConnections.forEach(function (item) {
+    if (handlers.indexOf(item.id) > -1 && !item.disconnected) {
+      signals.push(item.id);
+    }
+  });
+
+  return signals;
+}
+
 function isMaximized(win, match_state) {
   let check = false;
   let flags = Meta.MaximizeFlags;

diff --git a/[email protected]/modules/activitiesButton.js b/[email protected]/modules/activitiesButton.js
@@ -7,6 +7,7 @@ const Panel          = Main.panel;
 const AppMenu        = Panel.statusArea.appMenu;
 const ExtensionUtils = imports.misc.extensionUtils;
 const Unite          = ExtensionUtils.getCurrentExtension();
+const Helpers        = Unite.imports.helpers;
 const Convenience    = Unite.imports.convenience;
 
 var ActivitiesButton = new Lang.Class({
@@ -44,6 +45,8 @@ var ActivitiesButton = new Lang.Class({
   },
 
   _disconnectSignals: function() {
+    this._ovHandlerIDs = Helpers.overviewSignals(this._ovHandlerIDs);
+
     if (this._wtHandlerID) {
       WindowTracker.disconnect(this._wtHandlerID);
       delete this._wtHandlerID;

diff --git a/[email protected]/modules/desktopName.js b/[email protected]/modules/desktopName.js
@@ -8,6 +8,7 @@ const Panel          = Main.panel;
 const AppMenu        = Panel.statusArea.appMenu;
 const ExtensionUtils = imports.misc.extensionUtils;
 const Unite          = ExtensionUtils.getCurrentExtension();
+const Helpers        = Unite.imports.helpers;
 const Convenience    = Unite.imports.convenience;
 
 var DesktopName = new Lang.Class({
@@ -44,6 +45,8 @@ var DesktopName = new Lang.Class({
   },
 
   _disconnectSignals: function() {
+    this._ovHandlerIDs = Helpers.overviewSignals(this._ovHandlerIDs);
+
     if (this._wtHandlerID) {
       WindowTracker.disconnect(this._wtHandlerID);
       delete this._wtHandlerID;

diff --git a/[email protected]/modules/windowButtons.js b/[email protected]/modules/windowButtons.js
@@ -53,6 +53,8 @@ var WindowButtons = new Lang.Class({
   },
 
   _disconnectSignals: function() {
+    this._ovHandlerIDs = Helpers.overviewSignals(this._ovHandlerIDs);
+
     if (this._dsHandlerID) {
       global.display.disconnect(this._dsHandlerID);
       delete this._dsHandlerID;