1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 09:32:55 +08:00

Merge pull request #20562 from peppy/fix-score-submission-crash

Fix potential crash when score submission token retrival fails
This commit is contained in:
Dan Balasescu 2022-10-07 19:24:35 +09:00 committed by GitHub
commit 57e4d6cc4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -76,6 +76,7 @@ namespace osu.Game.Screens.Play
req.Success += r =>
{
Logger.Log($"Score submission token retrieved ({r.ID})");
token = r.ID;
tcs.SetResult(true);
};
@ -91,6 +92,11 @@ namespace osu.Game.Screens.Play
void handleTokenFailure(Exception exception)
{
// This method may be invoked multiple times due to the Task.Wait call above.
// We only really care about the first error.
if (!tcs.TrySetResult(false))
return;
if (HandleTokenRetrievalFailure(exception))
{
if (string.IsNullOrEmpty(exception.Message))
@ -104,8 +110,12 @@ namespace osu.Game.Screens.Play
this.Exit();
});
}
tcs.SetResult(false);
else
{
// Gameplay is allowed to continue, but we still should keep track of the error.
// In the future, this should be visible to the user in some way.
Logger.Log($"Score submission token retrieval failed ({exception.Message})");
}
}
}