From 48056b9dc8c6bcd8c531e01a569d0d3c63730ca8 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 23 Oct 2020 23:52:59 +0200
Subject: [PATCH] remove deleted tracks from the queue

---
 .../simplemobiletools/musicplayer/extensions/Context.kt   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/musicplayer/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/musicplayer/extensions/Context.kt
index 3cdd00123..a4a63309a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/musicplayer/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/musicplayer/extensions/Context.kt
@@ -10,7 +10,10 @@ import com.simplemobiletools.commons.extensions.getIntValue
 import com.simplemobiletools.commons.extensions.getLongValue
 import com.simplemobiletools.commons.extensions.getStringValue
 import com.simplemobiletools.commons.extensions.showErrorToast
-import com.simplemobiletools.commons.helpers.*
+import com.simplemobiletools.commons.helpers.AlphanumericComparator
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
+import com.simplemobiletools.commons.helpers.isOreoPlus
+import com.simplemobiletools.commons.helpers.isQPlus
 import com.simplemobiletools.musicplayer.databases.SongsDatabase
 import com.simplemobiletools.musicplayer.helpers.*
 import com.simplemobiletools.musicplayer.interfaces.PlaylistsDao
@@ -262,8 +265,8 @@ fun Context.removeQueueItems(tracks: List<Track>, callback: () -> Unit) {
         tracks.forEach {
             queueDAO.removeQueueItem(it.id)
             MusicService.mTracks.remove(it)
-            callback()
         }
+        callback()
     }
 }
 
@@ -279,6 +282,7 @@ fun Context.deleteTracks(tracks: List<Track>, callback: () -> Unit) {
         }
     }
 
+    removeQueueItems(tracks) {}
     EventBus.getDefault().post(Events.TrackDeleted())
     callback()
 }