From a536e544a50418ef48c62de22a3c43ba9979f55c Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Tue, 3 May 2022 21:01:26 -0500
Subject: [PATCH] Fixed queue duplication bug.

---
 src/main/base/browserwindow.ts | 2 +-
 src/renderer/main/vueapp.js    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 2556d2d9..244a2e25 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -1279,7 +1279,7 @@ export class BrowserWindow {
                 BrowserWindow.win.webContents.executeJavaScript(` 
                 window.localStorage.setItem("currentTrack", JSON.stringify(app.mk.nowPlayingItem));
                 window.localStorage.setItem("currentTime", JSON.stringify(app.mk.currentPlaybackTime));
-                window.localStorage.setItem("currentQueue", JSON.stringify(app.mk.queue.items));
+                window.localStorage.setItem("currentQueue", JSON.stringify(app.mk.queue._unplayedQueueItems));
                 ipcRenderer.send('stopGCast','');`)
                 BrowserWindow.win.destroy();
             }
diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index d7ab7365..12e37e89 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -706,6 +706,7 @@ const app = new Vue({
                         let lastItem = window.localStorage.getItem("currentTrack")
                         let time = window.localStorage.getItem("currentTime")
                         let queue = window.localStorage.getItem("currentQueue")
+                        app.mk.queue.position = 0; // Reset queue position.
                         if (lastItem != null) {
                             lastItem = JSON.parse(lastItem)
                             let kind = lastItem.attributes.playParams.kind;
@@ -725,7 +726,7 @@ const app = new Vue({
                                         if (queue != null) {
                                             queue = JSON.parse(queue)
                                             if (queue && queue.length > 0) {
-                                                let ids = queue.map(e => (e.playParams ? e.playParams.id : (e.attributes.playParams ? e.attributes.playParams.id : '')))
+                                                let ids = queue.map(e => (e.playParams ? e.playParams.id : (e.item.attributes.playParams ? e.item.attributes.playParams.id : '')))
                                                 let i = 0;
                                                 if (ids.length > 0) {
                                                     for (let id of ids) {