Close entries when seeking only if active

Author: devgianlu

core/src/main/java/xyz/gianlu/librespot/player/playback/PlayerQueueEntry.java

@@ -181,7 +181,7 @@ void seek(int pos) {
      * @throws IllegalStateException If the output is already set. Will also clear {@param output}.
      */
     void setOutput(@NotNull MixingLine.MixingOutput output) {
-        if (closed || this.output != null) {
+        if (closed || hasOutput()) {
             output.clear();
             throw new IllegalStateException("Cannot set output for " + this);
         }
@@ -211,6 +211,13 @@ private void clearOutput() {
         }
     }
 
+    /**
+     * @return Whether the entry is associated with an output.
+     */
+    public boolean hasOutput() {
+        return output != null;
+    }
+
     /**
      * Instructs to notify when this time instant is reached.
      *
@@ -310,7 +317,7 @@ public void run() {
             }
         }
 
-        output.toggle(false);
+        if (output != null) output.toggle(false);
         listener.playbackEnded(this);
         LOGGER.trace("{} terminated.", this);
     }
@@ -330,7 +337,7 @@ private void checkInstants(int time) {
      * @return Whether it has been closed
      */
     boolean closeIfUseless() {
-        if (output == null) {
+        if (!hasOutput()) {
             close();
             return true;
         }

core/src/main/java/xyz/gianlu/librespot/player/playback/PlayerSession.java

@@ -286,8 +286,9 @@ public String play(@NotNull PlayableId playable, int pos, @NotNull Reason reason
     public void seekCurrent(int pos) {
         if (queue.head() == null) return;
 
-        if (queue.prev() != null) queue.remove(queue.prev());
-        if (queue.next() != null) queue.remove(queue.next());
+        PlayerQueueEntry entry;
+        if ((entry = queue.prev()) != null && entry.hasOutput()) queue.remove(entry);
+        if ((entry = queue.next()) != null && entry.hasOutput()) queue.remove(entry);
 
         queue.head().seek(pos);
         sink.flush();