From d3597d123df778d54cac050c8ad45e89a737c10a Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Fri, 25 Mar 2022 21:43:09 +0530
Subject: [PATCH] Fixed some Playing queue crashes

---
 .../code/name/monkey/retromusic/service/MusicService.kt  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
index 965fd3031..b69eb4941 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
@@ -96,6 +96,7 @@ import com.bumptech.glide.request.target.SimpleTarget
 import com.bumptech.glide.request.transition.Transition
 import org.koin.java.KoinJavaComponent.get
 import java.util.*
+import kotlin.collections.ArrayList
 
 /**
  * @author Karim Abou Zeid (kabouzeid), Andrew Neal. Modified by Prathamesh More
@@ -175,10 +176,10 @@ class MusicService : MediaBrowserServiceCompat(),
     private lateinit var mediaStoreObserver: ContentObserver
     private var musicPlayerHandlerThread: HandlerThread? = null
     private var notHandledMetaChangedForCurrentTrack = false
-    private var originalPlayingQueue = mutableListOf<Song>()
+    private var originalPlayingQueue = ArrayList<Song>()
 
     @JvmField
-    var playingQueue = mutableListOf<Song>()
+    var playingQueue = ArrayList<Song>()
     var isPausedByTransientLossOfFocus = false
     private val becomingNoisyReceiver: BroadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
@@ -1037,8 +1038,8 @@ class MusicService : MediaBrowserServiceCompat(),
                     SAVED_POSITION_IN_TRACK, -1
                 )
             if (restoredQueue.size > 0 && restoredQueue.size == restoredOriginalQueue.size && restoredPosition != -1) {
-                originalPlayingQueue = restoredOriginalQueue
-                playingQueue = restoredQueue
+                originalPlayingQueue = ArrayList(restoredOriginalQueue)
+                playingQueue = ArrayList(restoredQueue)
                 position = restoredPosition
                 openCurrent()
                 prepareNext()