More reliable attempt to run onResponseHeader listener the last of installed extension.

1 files changed, 3 insertions, 2 deletions

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;
       }