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

Merge pull request #19669 from peppy/abort-load-player-more

Browse Source 
Handle cancellation at more points during `Player` initialisation
This commit is contained in:
Dan Balasescu 2022-08-10 13:53:27 +09:00 committed by GitHub
commit 87133b9cc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/Play/Player.cs
View File

@ -249,6 +249,9 @@ namespace osu.Game.Screens.Play
// this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources. // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
GameplayClockContainer.Add(rulesetSkinProvider); GameplayClockContainer.Add(rulesetSkinProvider);
if (cancellationToken.IsCancellationRequested)
return;
rulesetSkinProvider.AddRange(new Drawable[] rulesetSkinProvider.AddRange(new Drawable[]
{ {
failAnimationLayer = new FailAnimation(DrawableRuleset) failAnimationLayer = new FailAnimation(DrawableRuleset)
@ -279,6 +282,9 @@ namespace osu.Game.Screens.Play
}, },
}); });
if (cancellationToken.IsCancellationRequested)
return;
if (Configuration.AllowRestart) if (Configuration.AllowRestart)
{ {
rulesetSkinProvider.Add(new HotkeyRetryOverlay rulesetSkinProvider.Add(new HotkeyRetryOverlay