main #19

Merged
artem merged 39 commits from main into dev 2023-09-22 14:13:12 +02:00
2 changed files with 4 additions and 4 deletions
Showing only changes of commit 0a78c4ee19 - Show all commits

View File

@ -150,10 +150,10 @@ export default {
this.skipToSecond(this.currentTrackParent.progress.progress); this.skipToSecond(this.currentTrackParent.progress.progress);
} }
this.currentTrackParent.progress = undefined; this.currentTrackParent.progress = undefined;
} else { }
// Try to fix SAFARI // Try to fix SAFARI
this.audio.play(); this.audio.play();
}
}, },
pushHistoryItem() { pushHistoryItem() {
if (!this.currentUser._id) { if (!this.currentUser._id) {

View File

@ -154,7 +154,7 @@ export default {
this.$store.dispatch("artists/uploadNewCover", this.selectedArtist); this.$store.dispatch("artists/uploadNewCover", this.selectedArtist);
}, },
loadUserProgress() { loadUserProgress() {
if (!this.isPlaying || this.selectedTrack.parent.parent && this.selectedTrack.parent.parent._id != this.selectedArtist._id) { if (!this.isPlaying || !this.selectedTrack.parent.parent || this.selectedTrack.parent.parent._id != this.selectedArtist._id) {
this.$store.dispatch("user/getProgress", this.selectedArtist).then(() => { this.$store.dispatch("user/getProgress", this.selectedArtist).then(() => {
this.gotoTrack(); this.gotoTrack();
}); });