From e6b7d40784f215bd201210a342209ee95c75a155 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 14 Sep 2022 14:22:11 +1000
Subject: [PATCH] Apply autostartVideoOnPlaySelected to queue (#2896)

---
 ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx | 4 +++-
 ui/v2.5/src/locales/en-GB.json                       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index 49e3ba718..9f3905de2 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -538,6 +538,8 @@ const SceneLoader: React.FC = () => {
   }
 
   const autoplay = queryParams?.autoplay === "true";
+  const autoPlayOnSelected =
+    configuration?.interface.autostartVideoOnPlaySelected ?? false;
   const currentQueueIndex = queueScenes
     ? queueScenes.findIndex((s) => s.id === id)
     : -1;
@@ -621,7 +623,7 @@ const SceneLoader: React.FC = () => {
   function playScene(sceneID: string, newPage?: number) {
     sceneQueue.playScene(history, sceneID, {
       newPage,
-      autoPlay: true,
+      autoPlay: autoPlayOnSelected,
       continue: continuePlaylist,
     });
   }
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index a8d841fd9..51c0f11de 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -519,7 +519,7 @@
         "options": {
           "auto_start_video": "Auto-start video",
           "auto_start_video_on_play_selected": {
-            "description": "Auto-start scene videos when playing selected or random from Scenes page",
+            "description": "Auto-start scene videos when playing from queue, or playing selected or random from Scenes page",
             "heading": "Auto-start video when playing selected"
           },
           "continue_playlist_default": {