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

Ensure player is consumed at the point of scheduled push running the first time

Browse Source
This commit is contained in:
Dean Herbert 2020-12-10 16:32:14 +09:00
parent a5e2509d52
commit cc996ec7fc
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -274,6 +274,13 @@ namespace osu.Game.Screens.Play
}
}
private Player consumePlayer()
{
var consumed = player;
player = null;
return consumed;
}
private void prepareNewPlayer()
{
if (!this.IsCurrentScreen())
@ -331,6 +338,8 @@ namespace osu.Game.Screens.Play
scheduledPushPlayer = Scheduler.AddDelayed(() =>
{
contentOut();
// ensure that once we have reached this "point of no return", readyForPush will be false for all future checks (until a new player instance is prepared).
var consumedPlayer = consumePlayer();
TransformSequence<PlayerLoader> pushSequence = this.Delay(250);
@ -362,8 +371,6 @@ namespace osu.Game.Screens.Play
// Note that this may change if the player we load requested a re-run.
ValidForResume = false;
if (player.LoadedBeatmapSuccessfully)
this.Push(player);
else
this.Exit();
});
@ -373,6 +380,8 @@ namespace osu.Game.Screens.Play
{
Schedule(pushWhenLoaded);
}
if (consumedPlayer.LoadedBeatmapSuccessfully)
this.Push(consumedPlayer);
}
private void cancelLoad()