Fixed Contract filter never unsubscribing.

ethers-io · Apr 15, 2020 · 39c78f3 · 39c78f3
1 parent 284771e
commit 39c78f3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/packages/contracts/src.ts/index.ts b/packages/contracts/src.ts/index.ts
@@ -717,13 +717,13 @@ export class Contract {
     _checkRunningEvents(runningEvent: RunningEvent): void {
         if (runningEvent.listenerCount() === 0) {
             delete this._runningEvents[runningEvent.tag];
-        }
 
-        // If we have a poller for this, remove it
-        const emit = this._wrappedEmits[runningEvent.tag];
-        if (!emit) {
-            this.provider.off(runningEvent.filter, emit);
-            delete this._wrappedEmits[runningEvent.tag];
+            // If we have a poller for this, remove it
+            const emit = this._wrappedEmits[runningEvent.tag];
+            if (emit) {
+                this.provider.off(runningEvent.filter, emit);
+                delete this._wrappedEmits[runningEvent.tag];
+            }
         }
     }