okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/upcoming' into upcoming

Browse source
This commit is contained in:
Core 2022-01-24 01:49:43 +00:00
commit 7da8a86c07
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/renderer/index.js
View file

@ -2521,6 +2521,11 @@ const app = new Vue({
app.mk.play().then(() => { app.mk.play().then(() => {
if (app.mk.shuffleMode == 1) { if (app.mk.shuffleMode == 1) {
shuffleArray(query) shuffleArray(query)
} else {
for (let i = 0; i < query.length; i++) {
if (query[i].id == item.id) {query.splice(0, i+1);
break;}
}
} }
app.mk.queue.append(query) app.mk.queue.append(query)
}) })
@ -2551,6 +2556,10 @@ const app = new Vue({
let u = query; let u = query;
if (app.mk.shuffleMode == 1) { if (app.mk.shuffleMode == 1) {
shuffleArray(u) shuffleArray(u)
} else {
for (let i = 0; i < app.showingPlaylist.relationships.tracks.data.length; i++) {
if (app.showingPlaylist.relationships.tracks.data[i].id == item.id) {u.splice(0, i+1); break;}
}
} }
app.mk.queue.append(u) app.mk.queue.append(u)
} else { } else {
@ -2559,6 +2568,10 @@ const app = new Vue({
let u = query; let u = query;
if (app.mk.shuffleMode == 1) { if (app.mk.shuffleMode == 1) {
shuffleArray(u) shuffleArray(u)
} else {
for (let i = 0; i < app.showingPlaylist.relationships.tracks.data.length; i++) {
if (app.showingPlaylist.relationships.tracks.data[i].id == item.id) {u.splice(0, i+1); break;}
}
} }
app.mk.queue.append(u) app.mk.queue.append(u)
}) })