h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 06:52:56 +08:00
Code Issues Releases Wiki Activity

Stop playing previous beatmap even if new beatmap has no track

Browse Source
This commit is contained in:
Dean Herbert 2017-07-18 17:27:13 +09:00
parent 59416584c1
commit df60fc0f0a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/Select/SongSelect.cs
View File

@ -230,7 +230,13 @@ namespace osu.Game.Screens.Select
protected override void OnEntering(Screen last)
{
// this catches the case we're playing the theme song, and falls back to a more sane default.
// actual selection is done by the carousel when possible.
if (Beatmap.BeatmapSetInfo.DeletePending)
Beatmap = null;
base.OnEntering(last);
ensurePlayingSelected();
changeBackground(Beatmap);
@ -350,11 +356,11 @@ namespace osu.Game.Screens.Select
{
Track track = Beatmap?.Track;
trackManager.SetExclusive(track);
if (track != null)
{
trackManager.SetExclusive(track);
if (preview)
track.Seek(Beatmap.Metadata.PreviewTime);
if (preview) track.Seek(Beatmap.Metadata.PreviewTime);
track.Start();
}
}