From 49e35cb329c3d0465f2f1efa3d8e869e2af4d485 Mon Sep 17 00:00:00 2001
From: nick-delirium <nikita@openreplay.com>
Date: Wed, 24 Apr 2024 11:19:22 +0200
Subject: [PATCH] feat(ui): hotfix for chrome crashes

---
 frontend/app/player/web/MessageManager.ts | 7 +++----
 frontend/app/player/web/WebPlayer.ts      | 5 +++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/app/player/web/MessageManager.ts b/frontend/app/player/web/MessageManager.ts
index 122b80faa..d4328732e 100644
--- a/frontend/app/player/web/MessageManager.ts
+++ b/frontend/app/player/web/MessageManager.ts
@@ -212,13 +212,12 @@ export default class MessageManager {
   move(t: number): any {
     // usually means waiting for messages from live session
     if (Object.keys(this.tabs).length === 0) return;
-    this.tabCloseManager.moveReady(t).then(m => {
-      if (m) {
+    this.activeTabManager.moveReady(t).then(async (tabId) => {
+      const closeMessage = await this.tabCloseManager.moveReady(t)
+      if (closeMessage) {
         const closedTabs = this.tabCloseManager.closedTabs
         this.state.update({ closedTabs: Array.from(closedTabs) })
       }
-    })
-    this.activeTabManager.moveReady(t).then((tabId) => {
       // Moving mouse and setting :hover classes on ready view
       this.mouseMoveManager.move(t);
       const lastClick = this.clickManager.moveGetLast(t);
diff --git a/frontend/app/player/web/WebPlayer.ts b/frontend/app/player/web/WebPlayer.ts
index e90e11fc7..b248e178d 100644
--- a/frontend/app/player/web/WebPlayer.ts
+++ b/frontend/app/player/web/WebPlayer.ts
@@ -198,7 +198,12 @@ export default class WebPlayer extends Player {
   }
 
   changeTab = (tab: string) => {
+    const playing = this.wpState.get().playing
+    this.pause()
     this.messageManager.changeTab(tab)
+    if (playing) {
+      this.play()
+    }
   }
 
   clean = () => {