From 9fda955df6efe28e787a9a5255a988b41fdc83f3 Mon Sep 17 00:00:00 2001
From: austinried <4966622+austinried@users.noreply.github.com>
Date: Wed, 11 Aug 2021 13:39:58 +0900
Subject: [PATCH] fixed incorrect isPlaying state when shuffled

---
 app/hooks/trackplayer.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/hooks/trackplayer.ts b/app/hooks/trackplayer.ts
index 8341f37..443c22e 100644
--- a/app/hooks/trackplayer.ts
+++ b/app/hooks/trackplayer.ts
@@ -246,11 +246,16 @@ export const useSetQueue = () => {
 export const useIsPlaying = () => {
   const queueContextId = useStore(selectTrackPlayer.queueContextId)
   const currentTrackIdx = useStore(selectTrackPlayer.currentTrackIdx)
+  const shuffleOrder = useStore(selectTrackPlayer.shuffleOrder)
 
   return (contextId: string | undefined, track: number) => {
     if (contextId === undefined) {
       return track === currentTrackIdx
     }
+    if (shuffleOrder) {
+      const shuffledTrack = shuffleOrder.findIndex(i => i === track)
+      track = shuffledTrack !== undefined ? shuffledTrack : -1
+    }
     return contextId === queueContextId && track === currentTrackIdx
   }
 }