From 5ea7798c521581cb33032c675115a9cebeeb74b5 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Wed, 3 Dec 2025 20:22:46 -0800
Subject: [PATCH] fix shuffle mode playback index (#1297)

---
 src/renderer/store/player.store.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/renderer/store/player.store.ts b/src/renderer/store/player.store.ts
index eebae1ad8..e2d5d31d1 100644
--- a/src/renderer/store/player.store.ts
+++ b/src/renderer/store/player.store.ts
@@ -2087,7 +2087,12 @@ export const subscribeCurrentTrack = (
     return usePlayerStoreBase.subscribe(
         (state) => {
             const queue = state.getQueue();
-            const index = state.player.index;
+            let index = state.player.index;
+
+            if (isShuffleEnabled(state)) {
+                index = mapShuffledToQueueIndex(index, state.queue.shuffled);
+            }
+
             return { index, song: queue.items[index] };
         },
         (song, prevSong) => {