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

Improved readability

Browse Source
This commit is contained in:
Terochi 2023-02-06 07:59:37 +01:00
parent f58534f60c
commit 4f23e096d7
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -613,6 +613,7 @@ namespace osu.Game.Screens.Play
// if an exit has been requested, cancel any pending completion (the user has shown intention to exit). // if an exit has been requested, cancel any pending completion (the user has shown intention to exit).
resultsDisplayDelegate?.Cancel(); resultsDisplayDelegate?.Cancel();
// import current score if possible.
beginScoreImport(); beginScoreImport();
// The actual exit is performed if // The actual exit is performed if
@ -770,7 +771,11 @@ namespace osu.Game.Screens.Play
{ {
if (prepareScoreForDisplayTask == null) if (prepareScoreForDisplayTask == null)
{ {
beginScoreImport(); // Try importing score since the task hasn't been invoked yet.
if (!beginScoreImport())
// If the task hasn't started, the score will never be imported.
resultsDisplayDelegate?.Cancel();
return; return;
} }
@ -790,17 +795,25 @@ namespace osu.Game.Screens.Play
Scheduler.Add(resultsDisplayDelegate); Scheduler.Add(resultsDisplayDelegate);
} }
private void beginScoreImport() /// <summary>
/// Ends replay recording and runs <see cref="prepareAndImportScore"/> only when results can be shown
/// </summary>
/// <returns>
/// Whether the task has been invoked
/// </returns>
private bool beginScoreImport()
{ {
// We do not want to import the score in cases where we don't show results
bool canShowResults = Configuration.ShowResults && ScoreProcessor.HasCompleted.Value && GameplayState.HasPassed;
if (!canShowResults)
return;
// Ensure we are not writing to the replay any more, as we are about to consume and store the score. // Ensure we are not writing to the replay any more, as we are about to consume and store the score.
DrawableRuleset.SetRecordTarget(null); DrawableRuleset.SetRecordTarget(null);
// We do not want to import the score in cases where we don't show results
bool canShowResults = Configuration.ShowResults && ScoreProcessor.HasCompleted.Value && GameplayState.HasPassed;
if (!canShowResults)
return false;
prepareScoreForDisplayTask ??= Task.Run(prepareAndImportScore); prepareScoreForDisplayTask ??= Task.Run(prepareAndImportScore);
return true;
} }
/// <summary> /// <summary>