From 9c039848bc0fe48bae87214d6871c43c4b9a0a9c Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 12 Jul 2020 12:04:53 -0700
Subject: [PATCH] Simplify and add null check

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 5 ++---
 osu.Game/Overlays/Mods/ModSection.cs             | 2 +-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs       | 6 +++---
 osu.Game/Screens/Select/SongSelect.cs            | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 7203683711..40323c325e 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -388,9 +388,8 @@ namespace osu.Game.Online.Leaderboards
 
         private void getMods()
         {
-            songSelect.ModSelect.DeselectAll(true);
-
-            songSelect.Mods.Value = score.Mods;
+            if (songSelect != null)
+                songSelect.Mods.Value = score.Mods;
         }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 45fae90a1e..7235a18a23 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Overlays.Mods
             return base.OnKeyDown(e);
         }
 
-        public void DeselectAll(bool immediate = false) => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null), immediate);
+        public void DeselectAll() => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
 
         /// <summary>
         /// Deselect one or more mods in this section.
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index d83dd77401..3d0ad1a594 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Overlays.Mods
                                             {
                                                 Width = 180,
                                                 Text = "Deselect All",
-                                                Action = () => DeselectAll(),
+                                                Action = DeselectAll,
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
                                             },
@@ -328,10 +328,10 @@ namespace osu.Game.Overlays.Mods
             sampleOff = audio.Samples.Get(@"UI/check-off");
         }
 
-        public void DeselectAll(bool immediate = false)
+        public void DeselectAll()
         {
             foreach (var section in ModSectionsContainer.Children)
-                section.DeselectAll(immediate);
+                section.DeselectAll();
 
             refreshSelectedMods();
         }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 23fa3cd724..e3705b15fa 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        public ModSelectOverlay ModSelect { get; private set; }
+        protected ModSelectOverlay ModSelect { get; private set; }
 
         protected SampleChannel SampleConfirm { get; private set; }