From 5731b777f0cd7ad7e923b4e65a47998efbadaca7 Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Mon, 14 Feb 2022 23:56:23 +0530 Subject: [PATCH] Fixed a crash while removing songs from the queue --- .../name/monkey/retromusic/service/MusicService.kt | 12 ++++++++---- 1 file changed, 8 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 00c0d082f..a7ffcdfa2 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 @@ -975,12 +975,16 @@ class MusicService : MediaBrowserServiceCompat(), private fun removeSongImpl(song: Song) { val deletePosition = playingQueue.indexOf(song) - playingQueue.removeAt(deletePosition) - rePosition(deletePosition) + if (deletePosition != -1) { + playingQueue.removeAt(deletePosition) + rePosition(deletePosition) + } val originalDeletePosition = originalPlayingQueue.indexOf(song) - playingQueue.removeAt(originalDeletePosition) - rePosition(originalDeletePosition) + if (originalDeletePosition != -1) { + playingQueue.removeAt(originalDeletePosition) + rePosition(originalDeletePosition) + } } fun removeSong(song: Song) {