From 78df8cd178508e7f3bbb7f690816c1c117b03aa5 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 19 Nov 2024 10:05:14 +0100
Subject: [PATCH] fix: starting video from queue when autoplay countdown
 enabled

---
 .../libretube/services/OnlinePlayerService.kt    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt b/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt
index fbd500bb2..901ae93bd 100644
--- a/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt
+++ b/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt
@@ -182,15 +182,17 @@ open class OnlinePlayerService : AbstractPlayerService() {
      * Plays the next video from the queue
      */
     private fun playNextVideo(nextId: String? = null) {
-        if (nextId == null && PlayingQueue.repeatMode == Player.REPEAT_MODE_ONE) {
-            exoPlayer?.seekTo(0)
-            return
-        }
-
         saveWatchPosition()
 
-        if (!PlayerHelper.isAutoPlayEnabled(playlistId != null) && nextId == null) return
-        if (!isAudioOnlyPlayer && PlayerHelper.autoPlayCountdown) return
+        if (nextId == null) {
+            if (PlayingQueue.repeatMode == Player.REPEAT_MODE_ONE) {
+                exoPlayer?.seekTo(0)
+                return
+            }
+
+            if (!PlayerHelper.isAutoPlayEnabled(playlistId != null)) return
+            if (!isAudioOnlyPlayer && PlayerHelper.autoPlayCountdown) return
+        }
 
         val nextVideo = nextId ?: PlayingQueue.getNext() ?: return