1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 10:07:25 +08:00

Merge pull request #1033 from peppy/fix-working-beatmap-double-load

Fix WorkingBeatmap being loaded twice when using MusicController at SongSelect
This commit is contained in:
Thomas Müller 2017-07-20 20:53:53 +02:00 committed by GitHub
commit 9dc3987834

View File

@ -219,11 +219,16 @@ namespace osu.Game.Screens.Select
{
Action performLoad = delegate
{
bool preview = beatmap?.BeatmapSetInfoID != Beatmap.Value.BeatmapInfo.BeatmapSetInfoID;
// We may be arriving here due to another component changing the bindable Beatmap.
// In these cases, the other component has already loaded the beatmap, so we don't need to do so again.
if (beatmap?.Equals(Beatmap.Value.BeatmapInfo) != true)
{
bool preview = beatmap?.BeatmapSetInfoID != Beatmap.Value.BeatmapInfo.BeatmapSetInfoID;
Beatmap.Value = database.GetWorkingBeatmap(beatmap, Beatmap);
Beatmap.Value = database.GetWorkingBeatmap(beatmap, Beatmap);
ensurePlayingSelected(preview);
}
ensurePlayingSelected(preview);
changeBackground(Beatmap.Value);
};