From 3803f2f4624293b7c948a4ee9b6eb3211572a853 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Oct 2021 16:07:27 +0900
Subject: [PATCH] Fix leaderboard potentially displaying the wrong scores

Closes #14762.

This class is ugly. I think the whole process should be clened up once
we have correctly-scheduled `SynchronizationContext`s. There's not much
saving it as long as all these interdispersed `Schedule`s around
required.
---
 osu.Game/Online/Leaderboards/Leaderboard.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 4f8b27602b..e3ac9f603d 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -255,6 +255,7 @@ private void load()
         }
 
         private APIRequest getScoresRequest;
+        private ScheduledDelegate getScoresRequestCallback;
 
         protected abstract bool IsOnlineScope { get; }
 
@@ -282,13 +283,16 @@ protected void UpdateScores()
             getScoresRequest?.Cancel();
             getScoresRequest = null;
 
+            getScoresRequestCallback?.Cancel();
+            getScoresRequestCallback = null;
+
             pendingUpdateScores?.Cancel();
             pendingUpdateScores = Schedule(() =>
             {
                 PlaceholderState = PlaceholderState.Retrieving;
                 loading.Show();
 
-                getScoresRequest = FetchScores(scores => Schedule(() =>
+                getScoresRequest = FetchScores(scores => getScoresRequestCallback = Schedule(() =>
                 {
                     Scores = scores.ToArray();
                     PlaceholderState = Scores.Any() ? PlaceholderState.Successful : PlaceholderState.NoScores;
@@ -297,7 +301,7 @@ protected void UpdateScores()
                 if (getScoresRequest == null)
                     return;
 
-                getScoresRequest.Failure += e => Schedule(() =>
+                getScoresRequest.Failure += e => getScoresRequestCallback = Schedule(() =>
                 {
                     if (e is OperationCanceledException)
                         return;