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

Fix exit key during storyboard outro not progressing to results

Browse Source
This commit is contained in:
Dean Herbert 2023-10-12 19:26:32 +09:00
parent d174a6ce61
commit fa47309eef
No known key found for this signature in database
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,12 +72,12 @@ namespace osu.Game.Tests.Visual.Gameplay
}
[Test]
public void TestStoryboardExitDuringOutroStillExits()
public void TestStoryboardExitDuringOutroProgressesToResults()
{
CreateTest();
AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
AddStep("exit via pause", () => Player.ExitViaPause());
AddAssert("player exited", () => !Player.IsCurrentScreen() && Player.GetChildScreen() == null);
AddUntilStep("reached results screen", () => Stack.CurrentScreen is ResultsScreen);
}
[TestCase(false)]

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

@ -596,7 +596,7 @@ namespace osu.Game.Screens.Play
// Matching osu!stable behaviour, if the results screen is pending and the user requests an exit,
// show the results instead.
if (resultsDisplayDelegate != null && !isRestarting)
if (GameplayState.HasPassed && !isRestarting)
{
progressToResults(false);
return false;