From bf0a1167ec990f64f3f98993f018d2eb758b8395 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Aug 2021 13:35:39 +0900
Subject: [PATCH] Improve update flow and ensure selected mods is read from
 local context

---
 osu.Game/Overlays/Mods/ModButton.cs        | 35 ++++++++++------------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs |  1 +
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index f4233c65cb..247c78152d 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays.Mods
         private int selectedIndex = -1;
 
         [Resolved]
-        private Bindable<IReadOnlyList<Mod>> globalSelectedMods { get; set; }
+        private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; }
 
         /// <summary>
         /// Change the selected mod index of this button.
@@ -245,24 +245,20 @@ namespace osu.Game.Overlays.Mods
             foregroundIcon.Mod = mod;
             text.Text = mod.Name;
             Colour = mod.HasImplementation ? Color4.White : Color4.Gray;
-            updateCompatibility(mod);
+
+            Scheduler.AddOnce(updateCompatibility);
         }
 
-        private void updateCompatibility(Mod mod)
+        private void updateCompatibility()
         {
-            if (globalSelectedMods != null)
-            {
-                if (!globalSelectedMods.Value.Contains(mod))
-                {
-                    if (!ModUtils.CheckCompatibleSet(globalSelectedMods.Value.Concat(new[] { mod })))
-                    {
-                        incompatibleIcon.FadeIn();
-                        return;
-                    }
-                }
-            }
+            var m = SelectedMod ?? Mods.First();
 
-            incompatibleIcon.FadeOut();
+            bool isIncompatible = false;
+
+            if (selectedMods.Value.Count > 0 && !selectedMods.Value.Contains(m))
+                isIncompatible = !ModUtils.CheckCompatibleSet(selectedMods.Value.Append(m));
+
+            incompatibleIcon.FadeTo(isIncompatible ? 1 : 0, 200, Easing.OutQuint);
         }
 
         private void createIcons()
@@ -287,6 +283,7 @@ namespace osu.Game.Overlays.Mods
                     },
                 });
             }
+
             else
             {
                 iconsContainer.Add(foregroundIcon = new ModIcon(Mod, false)
@@ -344,14 +341,14 @@ namespace osu.Game.Overlays.Mods
                 },
                 new HoverSounds()
             };
-
             Mod = mod;
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void LoadComplete()
         {
-            globalSelectedMods.BindValueChanged(_ => updateCompatibility(SelectedMod ?? Mods.FirstOrDefault()), true);
+            base.LoadComplete();
+
+            selectedMods.BindValueChanged(_ => Scheduler.AddOnce(updateCompatibility), true);
         }
 
         public ITooltip GetCustomTooltip() => new ModButtonTooltip();
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 96eba7808f..fdef48d556 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -74,6 +74,7 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly ModSettingsContainer ModSettingsContainer;
 
+        [Cached]
         public readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
         private Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> availableMods;