Merge branch 'fix_playback_icon' into 'develop'

Reset playback on queue end

Closes #1380

See merge request funkwhale/funkwhale!1290
This commit is contained in:
Georg Krause 2021-04-07 04:59:42 +00:00
commit 0f295d98db
2 changed files with 7 additions and 1 deletions

View File

@ -0,0 +1 @@
Fixed track playback indicator to reset on queue end (#1380)

View File

@ -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)