diff --git a/tracker/tracker/src/main/app/index.ts b/tracker/tracker/src/main/app/index.ts index 11c1cc21d..ecc3d1f8b 100644 --- a/tracker/tracker/src/main/app/index.ts +++ b/tracker/tracker/src/main/app/index.ts @@ -354,6 +354,7 @@ export default class App { const thisTab = this.session.getTabId() const catchParentMessage = (event: MessageEvent) => { + if (!this.active()) return const { data } = event if (!data) return if (data.line === proto.parentAlive) { @@ -370,9 +371,6 @@ export default class App { } window.addEventListener('message', catchParentMessage) - this.attachStopCallback(() => { - window.removeEventListener('message', catchParentMessage) - }) if (this.bc !== null) { this.bc.postMessage({ @@ -429,6 +427,7 @@ export default class App { * */ let crossdomainFrameCount = 0 const catchIframeMessage = (event: MessageEvent) => { + if (!this.active()) return; const { data } = event if (!data) return if (data.line === proto.iframeSignal) { @@ -514,9 +513,6 @@ export default class App { } } window.addEventListener('message', catchIframeMessage) - this.attachStopCallback(() => { - window.removeEventListener('message', catchIframeMessage) - }) } }