From 76ebb3811a03ea45fb5279fab26c9951fe199ba9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 19:05:02 +0900
Subject: [PATCH] Fix mod icons potentially having incorrect colours

---
 osu.Game/Rulesets/UI/ModIcon.cs | 49 +++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 8ea6c74349..76fcb8e080 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -26,8 +26,6 @@ namespace osu.Game.Rulesets.UI
 
         private const float size = 80;
 
-        private readonly ModType type;
-
         public virtual string TooltipText => mod.IconTooltip;
 
         private Mod mod;
@@ -38,16 +36,22 @@ namespace osu.Game.Rulesets.UI
             set
             {
                 mod = value;
-                updateMod(value);
+
+                if (LoadState >= LoadState.Ready)
+                    updateMod(value);
             }
         }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private Color4 backgroundColour;
+        private Color4 highlightedColour;
+
         public ModIcon(Mod mod)
         {
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
 
-            type = mod.Type;
-
             Size = new Vector2(size);
 
             Children = new Drawable[]
@@ -79,10 +83,20 @@ namespace osu.Game.Rulesets.UI
                     Icon = FontAwesome.Solid.Question
                 },
             };
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             updateMod(mod);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Selected.BindValueChanged(_ => updateColour(), true);
+        }
+
         private void updateMod(Mod value)
         {
             modAcronym.Text = value.Acronym;
@@ -92,20 +106,14 @@ namespace osu.Game.Rulesets.UI
             {
                 modIcon.FadeOut();
                 modAcronym.FadeIn();
-                return;
+            }
+            else
+            {
+                modIcon.FadeIn();
+                modAcronym.FadeOut();
             }
 
-            modIcon.FadeIn();
-            modAcronym.FadeOut();
-        }
-
-        private Color4 backgroundColour;
-        private Color4 highlightedColour;
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            switch (type)
+            switch (value.Type)
             {
                 default:
                 case ModType.DifficultyIncrease:
@@ -139,12 +147,13 @@ namespace osu.Game.Rulesets.UI
                     modIcon.Colour = colours.Yellow;
                     break;
             }
+
+            updateColour();
         }
 
-        protected override void LoadComplete()
+        private void updateColour()
         {
-            base.LoadComplete();
-            Selected.BindValueChanged(selected => background.Colour = selected.NewValue ? highlightedColour : backgroundColour, true);
+            background.Colour = Selected.Value ? highlightedColour : backgroundColour;
         }
     }
 }