From 9efafffd9d0abab6293121d22740ecf4a373a90d Mon Sep 17 00:00:00 2001
From: Tony Wasserka <918-neobrain@users.noreply.dev.funkwhale.audio>
Date: Sat, 3 Apr 2021 13:15:23 +0200
Subject: [PATCH] Reset playback when reaching the queue end

Closes #1380.
---
 changes/changelog.d/1380.bugfix | 1 +
 front/src/store/player.js       | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 changes/changelog.d/1380.bugfix

diff --git a/changes/changelog.d/1380.bugfix b/changes/changelog.d/1380.bugfix
new file mode 100644
index 0000000000..07cf122814
--- /dev/null
+++ b/changes/changelog.d/1380.bugfix
@@ -0,0 +1 @@
+Fixed track playback indicator to reset on queue end (#1380)
diff --git a/front/src/store/player.js b/front/src/store/player.js
index f3dbbb8b79..d786c456fa 100644
--- a/front/src/store/player.js
+++ b/front/src/store/player.js
@@ -126,7 +126,7 @@ export default {
         logger.default.error('Could not record track in history')
       })
     },
-    trackEnded ({dispatch, rootState}, track) {
+    trackEnded ({commit, dispatch, rootState}, track) {
       let queueState = rootState.queue
       if (queueState.currentIndex === queueState.tracks.length - 1) {
         // we've reached last track of queue, trigger a reload
@@ -134,6 +134,11 @@ export default {
         dispatch('radios/populateQueue', null, {root: true})
       }
       dispatch('queue/next', null, {root: true})
+      if (queueState.ended) {
+        // Reset playback
+        commit('playing', false)
+        dispatch('updateProgress', 0)
+      }
     },
     trackErrored ({commit, dispatch, state}) {
       commit('errored', true)
-- 
GitLab