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

Remove dead code which was only there for the exit-specific scenario

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

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

@ -572,18 +572,6 @@ namespace osu.Game.Screens.Play
/// <returns>Whether this call resulted in a final exit.</returns> /// <returns>Whether this call resulted in a final exit.</returns>
protected bool PerformExit(bool showDialogFirst) protected bool PerformExit(bool showDialogFirst)
{ {
// there is a chance that an exit request occurs after the transition to results has already started.
// even in such a case, the user has shown intent, so forcefully return to this screen (to proceed with the upwards exit process).
if (!this.IsCurrentScreen())
{
ValidForResume = false;
// in the potential case that this instance has already been exited, this is required to avoid a crash.
if (this.GetChildScreen() != null)
this.MakeCurrent();
return true;
}
bool pauseOrFailDialogVisible = bool pauseOrFailDialogVisible =
PauseOverlay.State.Value == Visibility.Visible || FailOverlay.State.Value == Visibility.Visible; PauseOverlay.State.Value == Visibility.Visible || FailOverlay.State.Value == Visibility.Visible;
@ -617,11 +605,16 @@ namespace osu.Game.Screens.Play
// import current score if possible. // import current score if possible.
prepareAndImportScoreAsync(); prepareAndImportScoreAsync();
// Screen may not be current if a restart has been performed.
if (this.IsCurrentScreen())
{
// The actual exit is performed if // The actual exit is performed if
// - the pause / fail dialog was not requested // - the pause / fail dialog was not requested
// - the pause / fail dialog was requested but is already displayed (user showing intention to exit). // - the pause / fail dialog was requested but is already displayed (user showing intention to exit).
// - the pause / fail dialog was requested but couldn't be displayed due to the type or state of this Player instance. // - the pause / fail dialog was requested but couldn't be displayed due to the type or state of this Player instance.
this.Exit(); this.Exit();
}
return true; return true;
} }
@ -741,9 +734,6 @@ namespace osu.Game.Screens.Play
// is no chance that a user could return to the (already completed) Player instance from a child screen. // is no chance that a user could return to the (already completed) Player instance from a child screen.
ValidForResume = false; ValidForResume = false;
if (!Configuration.ShowResults)
return;
bool storyboardStillRunning = DimmableStoryboard.ContentDisplayed && !DimmableStoryboard.HasStoryboardEnded.Value; bool storyboardStillRunning = DimmableStoryboard.ContentDisplayed && !DimmableStoryboard.HasStoryboardEnded.Value;
// If the current beatmap has a storyboard, this method will be called again on storyboard completion. // If the current beatmap has a storyboard, this method will be called again on storyboard completion.
@ -766,10 +756,16 @@ namespace osu.Game.Screens.Play
/// <param name="withDelay">Whether a minimum delay (<see cref="RESULTS_DISPLAY_DELAY"/>) should be added before the screen is displayed.</param> /// <param name="withDelay">Whether a minimum delay (<see cref="RESULTS_DISPLAY_DELAY"/>) should be added before the screen is displayed.</param>
private void progressToResults(bool withDelay) private void progressToResults(bool withDelay)
{ {
resultsDisplayDelegate?.Cancel(); if (!Configuration.ShowResults)
return;
// Setting this early in the process means that even if something were to go wrong in the order of events following, there
// is no chance that a user could return to the (already completed) Player instance from a child screen.
ValidForResume = false;
double delay = withDelay ? RESULTS_DISPLAY_DELAY : 0; double delay = withDelay ? RESULTS_DISPLAY_DELAY : 0;
resultsDisplayDelegate?.Cancel();
resultsDisplayDelegate = new ScheduledDelegate(() => resultsDisplayDelegate = new ScheduledDelegate(() =>
{ {
if (prepareScoreForDisplayTask == null) if (prepareScoreForDisplayTask == null)

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

@ -414,6 +414,8 @@ namespace osu.Game.Screens.Play
quickRestart = quickRestartRequested; quickRestart = quickRestartRequested;
hideOverlays = true; hideOverlays = true;
ValidForResume = true; ValidForResume = true;
this.MakeCurrent();
} }
private void contentIn() private void contentIn()