From 5b07512d753e530409bc200aed0bdb17a1ec007a Mon Sep 17 00:00:00 2001
From: Damontecres <damontecres@gmail.com>
Date: Sat, 8 Nov 2025 13:44:30 -0500
Subject: [PATCH] Fix position reset on activating external subtitles

---
 .../damontecres/wholphin/ui/playback/PlaybackViewModel.kt     | 4 ++--
 .../com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt
index a80d4c58..1e27b78f 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackViewModel.kt
@@ -420,7 +420,7 @@ class PlaybackViewModel
             currentItemPlayback: ItemPlayback = this@PlaybackViewModel.currentItemPlayback.value!!,
             audioIndex: Int?,
             subtitleIndex: Int?,
-            positionMs: Long = C.TIME_UNSET,
+            positionMs: Long = 0,
             userInitiated: Boolean,
             enableDirectPlay: Boolean = true,
             enableDirectStream: Boolean = true,
@@ -485,7 +485,7 @@ class PlaybackViewModel
 
             Timber.d(
                 "changeStreams: userInitiated=$userInitiated, audioIndex=$audioIndex, subtitleIndex=$subtitleIndex, " +
-                    "enableDirectPlay=$enableDirectPlay, enableDirectStream=$enableDirectStream",
+                    "enableDirectPlay=$enableDirectPlay, enableDirectStream=$enableDirectStream, positionMs=$positionMs",
             )
 
             val maxBitrate =
diff --git a/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt b/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt
index bb352d28..1b48aa7e 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt
@@ -184,8 +184,8 @@ class MpvPlayer(
         startPositionMs: Long,
     ) {
         if (DEBUG) Timber.v("setMediaItems")
-        setMediaItems(mediaItems.subList(startIndex, mediaItems.size), false)
         this.startPositionMs = startPositionMs
+        setMediaItems(mediaItems.subList(startIndex, mediaItems.size), false)
     }
 
     override fun addMediaItems(