Fix shuffle returning true after queue was cleared

Author: DRSchlaubi

music/build.gradle.kts

@@ -1,3 +1,3 @@
 subprojects {
-    version = "3.5.17-SNAPSHOT"
+    version = "3.5.18-SNAPSHOT"
 }

music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/Queue.kt

@@ -11,12 +11,14 @@ class Queue(private var tracksList: MutableList<QueuedTrack> = mutableListOf())
                 nextIndex = 0
                 order = LinkedList(order.shuffled())
             } else {
-                val queue = order.subList(0, nextIndex)
-                val shuffled = order.subList(nextIndex.coerceAtMost(order.lastIndex), order.size)
-                val unShuffled = queue + shuffled.sorted()
+                if (order.isNotEmpty()) {
+                    val queue = order.subList(0, nextIndex)
+                    val shuffled = order.subList(nextIndex.coerceAtMost(order.lastIndex), order.size)
+                    val unShuffled = queue + shuffled.sorted()
 
+                    order = LinkedList(unShuffled)
+                }
                 nextIndex = tracksList.size
-                order = LinkedList(unShuffled)
             }
             field = value
         }
@@ -43,13 +45,17 @@ class Queue(private var tracksList: MutableList<QueuedTrack> = mutableListOf())
     fun poll(): QueuedTrack {
         val queuedTrack = tracksList[order.poll()]
         nextIndex = nextIndex.coerceAtMost(order.size)
+        if (order.size == 0) {
+            shuffle = false
+        }
         return queuedTrack
     }
 
     fun clear() {
         nextIndex = 0
         tracksList.clear()
         order.clear()
+        shuffle = false
     }
 
     fun isEmpty() = order.isEmpty()

music/player/src/test/kotlin/QueueTest.kt

@@ -6,6 +6,7 @@ import dev.schlaubi.mikmusic.player.SimpleQueuedTrack
 import dev.schlaubi.stdx.serialization.emptyJsonObject
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFalse
 import kotlin.test.assertNotEquals
 
 class QueueTest {
@@ -165,6 +166,25 @@ class QueueTest {
 
         assertEquals(track, queue.poll())
     }
+
+    @Test
+    fun `test shuffle is over after shuffle is over`() {
+        val queue = makeMockQueue()
+        queue.shuffle = true
+        repeat(queue.tracks.size) { queue.poll() }
+
+        assertFalse(queue.shuffle)
+    }
+
+    @Test
+    fun `test shuffle is over after shuffle is over, when adding unshuffled tracks`() {
+        val queue = makeMockQueue()
+        queue.addTracks(mockTrack(23))
+        queue.shuffle = true
+        repeat(queue.tracks.size) { queue.poll() }
+
+        assertFalse(queue.shuffle)
+    }
 }
 
 private fun makeMockQueue() = Queue(MutableList(10, ::mockTrack))