Fix issue with removal of tracks

Faeb35 · Jun 19, 2020 · 86dcc3a · 86dcc3a
1 parent 4c7d668
commit 86dcc3a
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java
@@ -215,12 +215,16 @@ public synchronized void addFiles(boolean append, MediaFile... mediaFiles) {
     public synchronized void removeFileAt(int index) {
         makeBackup();
         index = Math.max(0, Math.min(index, size() - 1));
+        if (this.index == index) {
+            this.index = -1;
+        }
         if (this.index > index) {
             this.index--;
         }
         files.remove(index);
-
-        this.index = Math.max(0, Math.min(this.index, size() - 1));
+        if (this.index != -1) {
+            this.index = Math.max(0, Math.min(this.index, size() - 1));
+        }
     }
 
     /**
@@ -231,7 +235,7 @@ public synchronized void clear() {
         files.clear();
         setRandomSearchCriteria(null);
         setInternetRadio(null);
-        index = 0;
+        index = -1;
     }
 
     /**
@@ -405,9 +409,6 @@ public synchronized Status getStatus() {
      */
     public synchronized void setStatus(Status status) {
         this.status = status;
-        if (index == -1) {
-            index = Math.max(0, Math.min(index, size() - 1));
-        }
     }
 
     /**