From f5c3cafa63e3c3ee1188c74d5e4c2048337db829 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 5 Aug 2020 09:48:23 +1000
Subject: [PATCH] Fix markers not autoplaying (#698)

* Fix marker seeking
* Autostart when loading from marker
---
 ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
index 9675df691..d4ecab331 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
@@ -113,7 +113,7 @@ export class ScenePlayerImpl extends React.Component<
       }
     });
 
-    this.player.on("playlist", () => {
+    this.player.on("firstFrame", () => {
       if (this.props.timestamp > 0) {
         this.player.seek(this.props.timestamp);
       }
@@ -155,12 +155,6 @@ export class ScenePlayerImpl extends React.Component<
       console.log("Trying next source in playlist");
       this.player.load(this.playlist);
       this.player.play();
-
-      this.player.on("firstFrame", () => {
-        if (this.props.timestamp > 0) {
-          this.player.seek(this.props.timestamp);
-        }
-      });
     }
   }
 
@@ -265,7 +259,8 @@ export class ScenePlayerImpl extends React.Component<
       primary: "html5",
       autostart:
         this.props.autoplay ||
-        (this.props.config ? this.props.config.autostartVideo : false),
+        (this.props.config ? this.props.config.autostartVideo : false) ||
+        this.props.timestamp > 0,
       repeat,
       playbackRateControls: true,
       playbackRates: [0.75, 1, 1.5, 2, 3, 4],