h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 12:33:01 +08:00
Code Issues Releases Wiki Activity

Merge pull request #14981 from peppy/fix-leaderboard-incorrect-load

Browse Source 
Fix leaderboard potentially displaying the wrong scores
This commit is contained in:
Dan Balasescu 2021-10-06 16:40:26 +09:00 committed by GitHub
commit 0d1243a0b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Online/Leaderboards/Leaderboard.cs
View File

@ -255,6 +255,7 @@ namespace osu.Game.Online.Leaderboards
} }
private APIRequest getScoresRequest; private APIRequest getScoresRequest;
private ScheduledDelegate getScoresRequestCallback;
protected abstract bool IsOnlineScope { get; } protected abstract bool IsOnlineScope { get; }
@ -282,13 +283,16 @@ namespace osu.Game.Online.Leaderboards
getScoresRequest?.Cancel(); getScoresRequest?.Cancel();
getScoresRequest = null; getScoresRequest = null;
getScoresRequestCallback?.Cancel();
getScoresRequestCallback = null;
pendingUpdateScores?.Cancel(); pendingUpdateScores?.Cancel();
pendingUpdateScores = Schedule(() => pendingUpdateScores = Schedule(() =>
{ {
PlaceholderState = PlaceholderState.Retrieving; PlaceholderState = PlaceholderState.Retrieving;
loading.Show(); loading.Show();
getScoresRequest = FetchScores(scores => Schedule(() => getScoresRequest = FetchScores(scores => getScoresRequestCallback = Schedule(() =>
{ {
Scores = scores.ToArray(); Scores = scores.ToArray();
PlaceholderState = Scores.Any() ? PlaceholderState.Successful : PlaceholderState.NoScores; PlaceholderState = Scores.Any() ? PlaceholderState.Successful : PlaceholderState.NoScores;
@ -297,7 +301,7 @@ namespace osu.Game.Online.Leaderboards
if (getScoresRequest == null) if (getScoresRequest == null)
return; return;
getScoresRequest.Failure += e => Schedule(() => getScoresRequest.Failure += e => getScoresRequestCallback = Schedule(() =>
{ {
if (e is OperationCanceledException) if (e is OperationCanceledException)
return; return;