From a21b8715b32b7c0e257cc572c56339f23b71486c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sat, 14 Jan 2023 15:44:31 +0100
Subject: [PATCH] Fix the queue order in the background player mode

---
 .../java/com/github/libretube/services/BackgroundMode.kt    | 6 ++++--
 .../com/github/libretube/ui/fragments/PlayerFragment.kt     | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/services/BackgroundMode.kt b/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
index a316f76eb..7925076d5 100644
--- a/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
+++ b/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
@@ -177,12 +177,14 @@ class BackgroundMode : Service() {
                 RetrofitInstance.api.getStreams(videoId)
             }.getOrNull() ?: return@launch
 
-            // add the playlist video to the queue
-            if (PlayingQueue.isEmpty() && !keepQueue) updateQueue()
+            // save the current stream to the queue
             streams?.toStreamItem(videoId)?.let {
                 PlayingQueue.updateCurrent(it)
             }
 
+            // add the playlist video to the queue
+            if (PlayingQueue.isEmpty() && !keepQueue) updateQueue()
+
             handler.post {
                 playAudio(seekToPosition)
             }
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
index 43998bf69..ce3a94c3a 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
@@ -472,7 +472,8 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
             videoId!!,
             exoPlayer.currentPosition,
             playlistId,
-            channelId
+            channelId,
+            true
         )
         handler.postDelayed({
             (activity as MainActivity).navController.navigate(R.id.audioPlayerFragment)