From d87cf56dc41f7007a292e5192570f45dddbbc30a Mon Sep 17 00:00:00 2001
From: seanmcbroom <sean.mcbroom@outlook.com>
Date: Tue, 10 Sep 2024 19:27:22 -0500
Subject: [PATCH] refactor: fix displaying subtitle tracks

---
 frontend/src/components/Playback/PlayerElement.vue | 5 ++---
 frontend/src/store/player-element.ts               | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Playback/PlayerElement.vue b/frontend/src/components/Playback/PlayerElement.vue
index 54adba5224a..13d5d5af3b4 100644
--- a/frontend/src/components/Playback/PlayerElement.vue
+++ b/frontend/src/components/Playback/PlayerElement.vue
@@ -15,17 +15,16 @@
         :loop="playbackManager.isRepeatingOnce"
         :class="{ 'uno-object-fill': playerElement.isStretched.value }"
         @loadeddata="onLoadedData">
-        <SubtitleTrack
-          v-if="subtitleSettings.state.enabled && playerElement.currentExternalSubtitleTrack?.parsed !== undefined" />
         <track
           v-for="sub in playbackManager.currentItemVttParsedSubtitleTracks"
-          v-else
           :key="`${playbackManager.currentSourceUrl}-${sub.srcIndex}`"
           kind="subtitles"
           :label="sub.label"
           :srclang="sub.srcLang"
           :src="sub.src">
       </Component>
+      <SubtitleTrack
+        v-if="subtitleSettings.state.enabled && playerElement.currentExternalSubtitleTrack?.parsed !== undefined" />
     </Teleport>
   </template>
 </template>
diff --git a/frontend/src/store/player-element.ts b/frontend/src/store/player-element.ts
index b1a9036ae95..987bc6143f6 100644
--- a/frontend/src/store/player-element.ts
+++ b/frontend/src/store/player-element.ts
@@ -20,6 +20,7 @@ import { router } from '@/plugins/router';
 import { remote } from '@/plugins/remote';
 import type { ParsedSubtitleTrack } from '@/plugins/workers/generic/subtitles';
 import { genericWorker } from '@/plugins/workers';
+import { subtitleSettings } from '@/store/client-settings/subtitle-settings';
 
 interface SubtitleExternalTrack extends PlaybackExternalTrack {
   parsed?: ParsedSubtitleTrack;
@@ -96,6 +97,7 @@ class PlayerElementStore extends CommonStore<PlayerElementState> {
    */
   private get _useCustomSubtitleTrack(): boolean {
     return !isNil(playbackManager.currentSubtitleTrack)
+      && subtitleSettings.state.enabled
       && playbackManager.currentSubtitleTrack.DeliveryMethod === SubtitleDeliveryMethod.External
       /**
        * If useFullscreen isn't supported we can assume the media player is Safari iOS