From 7317a1ad6f548f7343035e1085eac65a941d262f Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sun, 13 Feb 2022 17:54:00 +0700
Subject: [PATCH] fix

---
 src/main/base/browserwindow.ts        | 2 +-
 src/renderer/views/app/chrome-top.ejs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index f3d151d4..960dac7e 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -217,7 +217,7 @@ export class BrowserWindow {
                     res.send("Stopped")
                     break;
                 case "next":
-                    BrowserWindow.win.webContents.executeJavaScript("MusicKit.getInstance().skipToNextItem()")
+                    BrowserWindow.win.webContents.executeJavaScript("if (MusicKit.getInstance().queue.nextPlayableItemIndex != -1) {MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.nextPlayableItemIndex);}")
                     res.send("Next")
                     break;
                 case "previous":
diff --git a/src/renderer/views/app/chrome-top.ejs b/src/renderer/views/app/chrome-top.ejs
index 422fb24c..4c88f6fe 100644
--- a/src/renderer/views/app/chrome-top.ejs
+++ b/src/renderer/views/app/chrome-top.ejs
@@ -30,7 +30,7 @@
             <button class="playback-button play" @click="mk.play()" v-else></button>
         </div>
         <div class="app-chrome-item display--large">
-            <button class="playback-button next" @click="mk.skipToNextItem()"></button>
+            <button class="playback-button next" @click="skipToNextItem()"></button>
         </div>
         <div class="app-chrome-item display--large">
             <button class="playback-button--small repeat" v-if="mk.repeatMode == 0"