mirror of
https://github.com/ppy/osu
synced 2024-12-11 17:42:28 +00:00
Fix InvalidOperationException when exiting a map at the end
This commit is contained in:
parent
495eb04e2f
commit
8c564a69ed
@ -133,6 +133,16 @@ namespace osu.Game.Tests.Visual.Gameplay
|
||||
AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestPerformExitNoOutro()
|
||||
{
|
||||
CreateTest(null);
|
||||
AddStep("disable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, false));
|
||||
AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
|
||||
AddStep("exit via pause", () => Player.ExitViaPause());
|
||||
AddAssert("score shown", () => Player.IsScoreShown);
|
||||
}
|
||||
|
||||
protected override bool AllowFail => true;
|
||||
|
||||
protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
|
||||
|
@ -542,7 +542,11 @@ 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 (prepareScoreForDisplayTask != null)
|
||||
{
|
||||
completionProgressDelegate?.Cancel();
|
||||
completionProgressDelegate = null;
|
||||
updateCompletionState(true);
|
||||
}
|
||||
}
|
||||
|
||||
this.Exit();
|
||||
|
Loading…
Reference in New Issue
Block a user