Fix bgm_songsel playing on error

This commit is contained in:
LoveEevee 2020-03-16 19:00:32 +03:00
parent 8f736b5b23
commit 95eef4e8db
2 changed files with 13 additions and 8 deletions

View File

@ -177,13 +177,16 @@ class LoadSong{
if(title !== this.selectedSong.originalTitle){ if(title !== this.selectedSong.originalTitle){
title += " (" + this.selectedSong.originalTitle + ")" title += " (" + this.selectedSong.originalTitle + ")"
} }
this.clean() assets.sounds["v_start"].stop()
new SongSelect(false, false, this.touchEnabled, null, { setTimeout(() => {
name: "loadSongError", this.clean()
title: title, new SongSelect(false, false, this.touchEnabled, null, {
id: this.selectedSong.folder, name: "loadSongError",
error: error title: title,
}) id: this.selectedSong.folder,
error: error
})
}, 500)
} }
this.error = true this.error = true
} }

View File

@ -278,7 +278,9 @@ class SongSelect{
}else if((!p2.session || fadeIn) && "selectedSong" in localStorage){ }else if((!p2.session || fadeIn) && "selectedSong" in localStorage){
this.selectedSong = Math.min(Math.max(0, localStorage["selectedSong"] |0), this.songs.length - 1) this.selectedSong = Math.min(Math.max(0, localStorage["selectedSong"] |0), this.songs.length - 1)
} }
this.playSound(songIdIndex !== -1 ? "v_diffsel" : "v_songsel") if(!this.showWarning){
this.playSound(songIdIndex !== -1 ? "v_diffsel" : "v_songsel")
}
snd.musicGain.fadeOut() snd.musicGain.fadeOut()
this.playBgm(false) this.playBgm(false)
} }