From 407cc7d9def2e1b16ef44ac791c1b31be1319c0d Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Sat, 14 Nov 2020 21:33:13 +1300
Subject: [PATCH] Favor current_track data over index

---
 src/js/views/Queue.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/js/views/Queue.js b/src/js/views/Queue.js
index 0308fa46..c18ac9c6 100755
--- a/src/js/views/Queue.js
+++ b/src/js/views/Queue.js
@@ -369,7 +369,10 @@ const mapStateToProps = (state) => {
 
       // Siphon off this track if it's a full representation of our current track
       if (track.playing) {
-        current_track = track;
+        current_track = {
+          ...track,
+          ...core_current_track,
+        };
       }
 
       // Now add our compiled track for our tracklist