fix(player): Keep the player paused while loading tracks (#1878)

aniyomiorg · Jan 18, 2025 · e1cc45f · e1cc45f
1 parent 9773a91
commit e1cc45f
Showing 1 changed file with 25 additions and 1 deletion.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt
@@ -212,6 +212,10 @@ class PlayerViewModel @JvmOverloads constructor(
     private val _paused = MutableStateFlow(false)
     val paused = _paused.asStateFlow()
 
+    // False because the video shouldn't start paused
+    private val _pausedState = MutableStateFlow<Boolean?>(false)
+    val pausedState = _pausedState.asStateFlow()
+
     private val _controlsShown = MutableStateFlow(!playerPreferences.hideControls().get())
     val controlsShown = _controlsShown.asStateFlow()
     private val _seekBarShown = MutableStateFlow(!playerPreferences.hideControls().get())
@@ -400,7 +404,7 @@ class PlayerViewModel @JvmOverloads constructor(
 
         isLoadingTracks.update { _ -> true }
         updateIsLoadingEpisode(false)
-        unpause()
+        setPausedState()
     }
 
     @Immutable
@@ -454,6 +458,10 @@ class PlayerViewModel @JvmOverloads constructor(
 
         val idx = videoList.value.indexOf(video)
 
+        updatePausedState()
+        // Pause until everything has loaded
+        pause()
+
         activity.setVideoList(
             qualityIndex = idx,
             videos = videoList.value,
@@ -526,6 +534,22 @@ class PlayerViewModel @JvmOverloads constructor(
         _readAhead.update { value.toFloat() }
     }
 
+    private fun updatePausedState() {
+        _pausedState.update { _ -> paused.value }
+    }
+
+    private fun setPausedState() {
+        pausedState.value?.let {
+            if (it) {
+                pause()
+            } else {
+                unpause()
+            }
+
+            _pausedState.update { _ -> null }
+        }
+    }
+
     fun pauseUnpause() {
         if (paused.value) {
             unpause()