sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 08:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12715 from Cublibre/fix-early-exit-crash

Browse Source 
Fix InvalidOperationException when exiting a map at the end
This commit is contained in:
Dean Herbert
2021-05-09 23:21:19 +09:00
committed by GitHub
parent a480e530fb ae2b5a0806
commit 2bcf1ed306
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,6 +133,16 @@ namespace osu.Game.Tests.Visual.Gameplay
AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration); 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("player exited", () => Stack.CurrentScreen == null);
}
protected override bool AllowFail => true; protected override bool AllowFail => true;
protected override Ruleset CreatePlayerRuleset() => new OsuRuleset(); protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();

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

@ -543,9 +543,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 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)
{
updateCompletionState(true); updateCompletionState(true);
} }
}
this.Exit(); this.Exit();
} }