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

Don't restart completion delegate on exit, revert exit behavior to lazer

Browse Source
This commit is contained in:
Christine Chen 2021-05-08 11:45:31 -04:00
parent 8c564a69ed
commit 25312b3e88
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
View File

@ -140,7 +140,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("disable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, false)); AddStep("disable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, false));
AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value); AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
AddStep("exit via pause", () => Player.ExitViaPause()); AddStep("exit via pause", () => Player.ExitViaPause());
AddAssert("score shown", () => Player.IsScoreShown); AddAssert("score not shown", () => !Player.IsScoreShown);
} }
protected override bool AllowFail => true; protected override bool AllowFail => true;

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

@ -541,10 +541,8 @@ namespace osu.Game.Screens.Play
} }
// if the score is ready for display but results screen has not been pushed yet (e.g. storyboard is still playing beyond gameplay), then transition to results screen instead of exiting. // if the score is ready for display but results screen has not been pushed yet (e.g. storyboard is still playing beyond gameplay), then transition to results screen instead of exiting.
if (prepareScoreForDisplayTask != null) if (prepareScoreForDisplayTask != null && completionProgressDelegate == null)
{ {
completionProgressDelegate?.Cancel();
completionProgressDelegate = null;
updateCompletionState(true); updateCompletionState(true);
} }
} }