fix play next logic

Flectone · Apr 7, 2024 · 9d63c5b · 9d63c5b
1 parent eb2e74c
commit 9d63c5b
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/java/net/flectone/music/javafx/controller/ControllerApp.java b/src/main/java/net/flectone/music/javafx/controller/ControllerApp.java
@@ -140,14 +140,14 @@ public MediaBridge(ControllerApp controllerApp, WebEngine mediaWebEngine, Queue<
         public void playNext(boolean skip) {
             Platform.runLater(() -> {
                 if (controllerApp.isEnableMedia()) {
-                    String media = skip ? null : controllerApp.getMediaName();
 
-                    if (media == null) {
-                        controllerApp.updateMediaQueueListView();
-                        media = mediaQueue.poll();
+                    if (!skip && controllerApp.getMediaName() != null) {
+                        controllerApp.pausePlayer();
+                        return;
                     }
 
-                    System.out.println(media);
+                    controllerApp.updateMediaQueueListView();
+                    String media = mediaQueue.poll();
 
                     if (media != null) {
                         mediaWebEngine.load(media);
@@ -156,6 +156,8 @@ public void playNext(boolean skip) {
                     }
 
                     mediaWebEngine.load(null);
+                    controllerApp.playPlayer();
+                    return;
                 }
 
                 if (skip) {