From 2c597874bf8340cde91856f931855a08d092b10b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 1 Jul 2018 18:17:02 +0900
Subject: [PATCH] Fix leaderboard showing placeholder briefly when entering
 song select

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

diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index ac6154369d..a0d447afed 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         private ScheduledDelegate showScoresDelegate;
 
+        private bool scoresLoadedOnce;
+
         private IEnumerable<Score> scores;
         public IEnumerable<Score> Scores
         {
@@ -48,6 +50,8 @@ namespace osu.Game.Screens.Select.Leaderboards
             {
                 scores = value;
 
+                scoresLoadedOnce = true;
+
                 scrollFlow?.FadeOut(fade_duration, Easing.OutQuint).Expire();
                 scrollFlow = null;
 
@@ -227,6 +231,10 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         private void updateScores()
         {
+            // don't display any scores or placeholder until the first Scores_Set has been called.
+            // this avoids scope changes flickering a "no scores" placeholder before initialisation of song select is finished.
+            if (!scoresLoadedOnce) return;
+
             getScoresRequest?.Cancel();
             getScoresRequest = null;