From 0750c3cb6a3ae9f8bc614fe61f082e936ba4f705 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 23:44:46 +0900
Subject: [PATCH] Add back immediate deselection flow to ensure user selections
 can occur without contention

---
 osu.Game/Overlays/Mods/ModSection.cs           | 10 ++++++++--
 osu.Game/Overlays/Mods/SoloModSelectOverlay.cs |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 3f93eec7df..ecbcba7ad3 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -158,7 +158,8 @@ namespace osu.Game.Overlays.Mods
         /// Deselect one or more mods in this section.
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
-        public void DeselectTypes(IEnumerable<Type> modTypes)
+        /// <param name="immediate">Whether the deselection should happen immediately. Should only be used when required to ensure correct selection flow.</param>
+        public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false)
         {
             foreach (var button in buttons)
             {
@@ -167,7 +168,12 @@ namespace osu.Game.Overlays.Mods
                 foreach (var type in modTypes)
                 {
                     if (type.IsInstanceOfType(button.SelectedMod))
-                        pendingSelectionOperations.Enqueue(button.Deselect);
+                    {
+                        if (immediate)
+                            button.Deselect();
+                        else
+                            pendingSelectionOperations.Enqueue(button.Deselect);
+                    }
                 }
             }
         }
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
index aa0e78c126..d039ad1f98 100644
--- a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Mods
             base.OnModSelected(mod);
 
             foreach (var section in ModSectionsContainer.Children)
-                section.DeselectTypes(mod.IncompatibleMods);
+                section.DeselectTypes(mod.IncompatibleMods, true);
         }
     }
 }