From 23e36b12fef983c12935aec76af2d1a22bf18fc7 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 28 Feb 2025 18:22:13 +1100
Subject: [PATCH] Clear markers on unmount (#5678)

---
 ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
index b88e7f51b..0cb14a1d8 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
@@ -714,7 +714,6 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = ({
     }));
 
     const markers = player!.markers();
-    markers.clearMarkers();
 
     const uniqueTagNames = markerData
       .map((marker) => marker.primaryTag.name)
@@ -772,6 +771,8 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = ({
 
     return () => {
       player.off("loadedmetadata", handleLoadMetadata);
+      const markers = player!.markers();
+      markers.clearMarkers();
     };
   }, [getPlayer, scene, loadMarkers]);