Better handle the passing of Beatmap and updating of scores.

PresentScores was dangerous as it could potentially bring up unsafe threading scenarios. This ensures everything will work well in all cases.

osu.Game/Screens/Select/BeatmapDetailArea.cs

@@ -21,10 +21,18 @@ namespace osu.Game.Screens.Select
 
         private OsuGame game;
 
-        [BackgroundDependencyLoader(permitNulls: true)]
+        private WorkingBeatmap beatmap;
-        private void load(OsuGame game)
+        public WorkingBeatmap Beatmap
         {
-            this.game = game;
+            get
+            {
+                return beatmap;
+            }
+            set
+            {
+                beatmap = value;
+                if (IsLoaded) Schedule(updateScores);
+            }
         }
 
         public BeatmapDetailArea()
@@ -47,6 +55,9 @@ namespace osu.Game.Screens.Select
                                 Leaderboard.Show();
                                 break;
                         }
+
+                        //for now let's always update scores.
+                        updateScores();
                     },
                 },
                 content = new Container
@@ -69,15 +80,27 @@ namespace osu.Game.Screens.Select
             });
         }
 
-        private GetScoresRequest getScoresRequest;
+        protected override void LoadComplete()
-        public void PresentScores(WorkingBeatmap beatmap)
         {
-            if (game == null) return;
+            base.LoadComplete();
+            updateScores();
+        }
+
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load(OsuGame game)
+        {
+            this.game = game;
+        }
+
+        private GetScoresRequest getScoresRequest;
+        private void updateScores()
+        {
+            if (game == null || !IsLoaded) return;
 
             Leaderboard.Scores = null;
             getScoresRequest?.Cancel();
 
-            if (beatmap?.BeatmapInfo == null) return;
+            if (beatmap?.BeatmapInfo == null || !Leaderboard.IsPresent) return;
 
             getScoresRequest = new GetScoresRequest(beatmap.BeatmapInfo);
             getScoresRequest.Success += r => Leaderboard.Scores = r.Scores;

osu.Game/Screens/Select/PlaySongSelect.cs

@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Select
         {
             beatmap?.Mods.BindTo(modSelect.SelectedMods);
 
-            beatmapDetails.PresentScores(beatmap);
+            beatmapDetails.Beatmap = beatmap;
 
             base.OnBeatmapChanged(beatmap);
         }