h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-19 13:53:10 +08:00
Code Issues Releases Wiki Activity

Merge pull request #5934 from iiSaLMaN/fix-switching-ruleset-unpauses-beatmap

Browse Source 
Ensure playing track of beatmap selected only if a track change occurred
This commit is contained in:
Dan Balasescu 2019-09-02 16:06:25 +09:00 committed by GitHub
commit 370ac49ea5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -414,7 +414,11 @@ namespace osu.Game.Screens.Select
{ {
Logger.Log($"beatmap changed from \"{Beatmap.Value.BeatmapInfo}\" to \"{beatmap}\""); Logger.Log($"beatmap changed from \"{Beatmap.Value.BeatmapInfo}\" to \"{beatmap}\"");
Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap, Beatmap.Value); WorkingBeatmap previous = Beatmap.Value;
Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap, previous);
if (this.IsCurrentScreen() && Beatmap.Value?.Track != previous?.Track)
ensurePlayingSelected();
if (beatmap != null) if (beatmap != null)
{ {
@ -425,8 +429,6 @@ namespace osu.Game.Screens.Select
} }
} }
if (this.IsCurrentScreen())
ensurePlayingSelected();
UpdateBeatmap(Beatmap.Value); UpdateBeatmap(Beatmap.Value);
} }
} }