h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-27 14:12:56 +08:00
Code Issues Releases Wiki Activity

Merge pull request #28040 from peppy/fix-background-load-order

Browse Source 
Fix incorrect background being loaded due to async race
This commit is contained in:
Dan Balasescu 2024-05-01 04:23:27 +09:00 committed by GitHub
commit ff91284be2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
View File

@ -56,10 +56,6 @@ namespace osu.Game.Screens.Backgrounds
introSequence = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence); introSequence = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence);
AddInternal(seasonalBackgroundLoader); AddInternal(seasonalBackgroundLoader);
// Load first background asynchronously as part of BDL load.
currentDisplay = RNG.Next(0, background_count);
Next();
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -73,6 +69,9 @@ namespace osu.Game.Screens.Backgrounds
introSequence.ValueChanged += _ => Scheduler.AddOnce(next); introSequence.ValueChanged += _ => Scheduler.AddOnce(next);
seasonalBackgroundLoader.SeasonalBackgroundChanged += () => Scheduler.AddOnce(next); seasonalBackgroundLoader.SeasonalBackgroundChanged += () => Scheduler.AddOnce(next);
currentDisplay = RNG.Next(0, background_count);
Next();
// helper function required for AddOnce usage. // helper function required for AddOnce usage.
void next() => Next(); void next() => Next();
} }