fixup! Fix #7593: nw2 Window removing listeners on 'loaded' event

nwjs · Oct 18, 2020 · bf12d58 · bf12d58
1 parent a6496dd
commit bf12d58
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/resources/api_nw_newwin.js b/src/resources/api_nw_newwin.js
@@ -149,6 +149,7 @@ NWWindow.prototype.on = function (event, callback, record) {
   function wrap(cb) {
     var fn = (cb || callback).bind(self);
     fn.listener = callback;
+    fn.c_win_id = self.cWindow.id;
     callback.__nw_cb = fn;
     return fn;
   }
@@ -323,13 +324,17 @@ NWWindow.prototype.removeAllListeners = function (event) {
   }
   if (wrapEventsMapNewWin.hasOwnProperty(event)) {
     for (let l of chrome.windows[wrapEventsMapNewWin[event]].getListeners()) {
-      chrome.windows[wrapEventsMapNewWin[event]].removeListener(l);
+      if (l.c_win_id === this.cWindow.id) {
+        chrome.windows[wrapEventsMapNewWin[event]].removeListener(l);
+      }
     }
     return this;
   }
   if (event === 'loaded') {
     for (let l of chrome.tabs.onUpdated.getListeners()) {
-      chrome.tabs.onUpdated.removeListener(l);
+      if (l.c_win_id === this.cWindow.id) {
+        chrome.tabs.onUpdated.removeListener(l);
+      }
     }
     return this;
   }