From bb232e0895ba2090c5b4555e882453c5f60f2dfb Mon Sep 17 00:00:00 2001
From: hackademix
Date: Sat, 18 Aug 2018 22:52:34 +0200
Subject: More reliable attempt to run onResponseHeader listener the last of
 installed extension.

---
 src/lib/LastListener.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/lib/LastListener.js')

diff --git a/src/lib/LastListener.js b/src/lib/LastListener.js
index 51600eb..6506e32 100644
--- a/src/lib/LastListener.js
+++ b/src/lib/LastListener.js
@@ -19,12 +19,13 @@ class LastListener {
     let ww = this._wrapped = [listener, listener].map(l => {
       let w = (...args) => {
         if (this.observed.hasListener(w._other)) {
-          this.observed.removeListener(w._other);
-          if (this.last === w) return this.defaultResult;
+          this.observed.removeListener(w);
+          if (this.last !== w) return this.defaultResult;
         } else if (this.installed) { 
           this.observed.addListener(w._other, ...this.extras);
           this.last = w._other;
         }
+        debug("Running listener", w === ww[0] ? 0 : 1, ...args);
         return this.installed ? this.listener(...args)
           : this.defaultResult;
       }
-- 
cgit v1.2.3