From b12c71f27709d30711d73c73667e4a6be28f782c Mon Sep 17 00:00:00 2001
From: nick-delirium <nikita@openreplay.com>
Date: Wed, 2 Oct 2024 15:50:36 +0200
Subject: [PATCH] fixes for bad start, iframes; 14.0.9

---
 tracker/tracker/src/main/app/index.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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