Fix exception when queuing tracks whilst shuffle is enabled

DRSchlaubi · Jun 29, 2024 · a26fe8b · a26fe8b
1 parent 77f0d57
commit a26fe8b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/music/build.gradle.kts b/music/build.gradle.kts
@@ -1,3 +1,3 @@
 subprojects {
-    version = "3.8.4-SNAPSHOT"
+    version = "3.8.5-SNAPSHOT"
 }
diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/Queue.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/Queue.kt
@@ -45,7 +45,7 @@ class Queue(private var tracksList: MutableList<QueuedTrack> = mutableListOf())
 
     fun poll(): QueuedTrack {
         val queuedTrack = tracksList[order.poll()]
-        nextIndex--
+        nextIndex = (nextIndex - 1).coerceAtLeast(0)
         if (order.isEmpty()) {
             shuffle = false
         }

diff --git a/music/player/src/test/kotlin/QueueTest.kt b/music/player/src/test/kotlin/QueueTest.kt
@@ -63,6 +63,17 @@ class QueueTest {
         assertEquals(mockTrack, queue.poll())
     }
 
+    @Test
+    fun `test queue works whilst shuffle is playing`() {
+        val queue = makeMockQueue()
+        queue.shuffle = true
+        queue.poll()
+        val mockTrack = mockTrack(11)
+        queue.addTracks(mockTrack)
+
+        assertEquals(mockTrack, queue.poll())
+    }
+
     @Test
     fun `test un-shuffle after queue`() {
         val queue = makeMockQueue()