fix correcting playlist when removing song

OpenDonationAssistant · Mar 9, 2024 · c873b21 · c873b21
1 parent 96bcab2
commit c873b21
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/logic/playlist/Playlist.ts b/src/logic/playlist/Playlist.ts
@@ -43,15 +43,18 @@ class Playlist {
   }
 
   removeSong(index: number) {
-    if (index < 0 || index > this._songs.length) {
+    if (index < 0 || index >= this._songs.length) {
       return;
     }
     const originId = this._songs[index].originId;
     if (originId) {
       markListened(originId);
     }
     this._songs.splice(index, 1);
-    if (this._songs.length == 0) {
+    if (
+      this._songs.length == 0 ||
+      (this._index && this._index >= this._songs.length)
+    ) {
       this._index = null;
     }
     this.triggerListeners();