From 48732e49b94967317181137d08f2cbc642f54b9f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 5 Dec 2019 04:20:13 +0300
Subject: [PATCH] Improve async logic

---
 osu.Game/Overlays/RankingsOverlay.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index d3586a538b..948d165b82 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -15,6 +15,7 @@ using osu.Game.Online.API;
 using System.Threading;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Rankings.Tables;
+using osu.Framework.Threading;
 
 namespace osu.Game.Overlays
 {
@@ -30,6 +31,7 @@ namespace osu.Game.Overlays
         private readonly DimmedLoadingLayer loading;
 
         private APIRequest request;
+        private ScheduledDelegate showTableDelegate;
         private CancellationTokenSource cancellationToken;
 
         [Resolved]
@@ -120,11 +122,10 @@ namespace osu.Game.Overlays
 
             loading.Show();
 
+            showTableDelegate?.Cancel();
             cancellationToken?.Cancel();
             request?.Cancel();
 
-            cancellationToken = new CancellationTokenSource();
-
             switch (scope.Value)
             {
                 default:
@@ -184,12 +185,12 @@ namespace osu.Game.Overlays
 
         private void loadTable(Drawable table)
         {
-            LoadComponentAsync(table, t =>
+            showTableDelegate = Schedule(() => LoadComponentAsync(table, t =>
             {
                 contentPlaceholder.Clear();
                 contentPlaceholder.Add(t);
                 loading.Hide();
-            }, cancellationToken.Token);
+            }, (cancellationToken = new CancellationTokenSource()).Token));
         }
     }
 }