From 4fa22146b82043a2f14f181af1c0bf9b113b3c43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Apr 2017 18:48:28 +0900
Subject: [PATCH] Increase safety of score lookups when leaderboard isn't
 visible.

---
 osu.Game/Screens/Select/Leaderboards/Leaderboard.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 2c51429d4c..02a412685c 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -11,6 +11,7 @@
 using osu.Framework.Graphics.Primitives;
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Threading;
 using osu.Game.Database;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Online.API;
@@ -93,13 +94,18 @@ public Leaderboard()
 
         private BeatmapInfo beatmap;
 
+        private ScheduledDelegate pendingBeatmapSwitch;
+
         public BeatmapInfo Beatmap
         {
             get { return beatmap; }
             set
             {
                 beatmap = value;
-                Schedule(updateScores);
+                Scores = null;
+
+                pendingBeatmapSwitch?.Cancel();
+                pendingBeatmapSwitch = Schedule(updateScores);
             }
         }