MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 5fd7889380 9efafffd9d
commit 0f295d98db
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/1380.bugfix Normal file
View File

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

7
front/src/store/player.js
View File

@ -126,7 +126,7 @@ export default {
logger.default.error('Could not record track in history') logger.default.error('Could not record track in history')
}) })
}, },
trackEnded ({dispatch, rootState}, track) { trackEnded ({commit, dispatch, rootState}, track) {
let queueState = rootState.queue let queueState = rootState.queue
if (queueState.currentIndex === queueState.tracks.length - 1) { if (queueState.currentIndex === queueState.tracks.length - 1) {
// we've reached last track of queue, trigger a reload // we've reached last track of queue, trigger a reload
@ -134,6 +134,11 @@ export default {
dispatch('radios/populateQueue', null, {root: true}) dispatch('radios/populateQueue', null, {root: true})
} }
dispatch('queue/next', null, {root: true}) dispatch('queue/next', null, {root: true})
if (queueState.ended) {
// Reset playback
commit('playing', false)
dispatch('updateProgress', 0)
}
}, },
trackErrored ({commit, dispatch, state}) { trackErrored ({commit, dispatch, state}) {
commit('errored', true) commit('errored', true)