From 83ba06e7afc42d59273515a1a8b277daeca64af6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 11 May 2022 19:33:52 +0200
Subject: [PATCH] Extract helper property for accessing all mods

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 567e91e3fa..7e28ab4b1f 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -65,6 +65,7 @@ namespace osu.Game.Overlays.Mods
 
         private readonly Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> availableMods = new Bindable<Dictionary<ModType, IReadOnlyList<Mod>>>();
         private readonly Dictionary<ModType, IReadOnlyList<ModState>> localAvailableMods = new Dictionary<ModType, IReadOnlyList<ModState>>();
+        private IEnumerable<ModState> allLocalAvailableMods => localAvailableMods.SelectMany(pair => pair.Value);
 
         private readonly BindableBool customisationVisible = new BindableBool();
 
@@ -294,7 +295,7 @@ namespace osu.Game.Overlays.Mods
 
         private void filterMods()
         {
-            foreach (var modState in localAvailableMods.Values.SelectMany(m => m))
+            foreach (var modState in allLocalAvailableMods)
                 modState.Filtered.Value = !modState.Mod.HasImplementation || !IsValidMod.Invoke(modState.Mod);
         }
 
@@ -372,7 +373,7 @@ namespace osu.Game.Overlays.Mods
 
             var newSelection = new List<Mod>();
 
-            foreach (var modState in localAvailableMods.SelectMany(pair => pair.Value))
+            foreach (var modState in allLocalAvailableMods)
             {
                 var matchingSelectedMod = SelectedMods.Value.SingleOrDefault(selected => selected.GetType() == modState.Mod.GetType());
 
@@ -399,10 +400,9 @@ namespace osu.Game.Overlays.Mods
             if (externalSelectionUpdateInProgress)
                 return;
 
-            var candidateSelection = localAvailableMods.SelectMany(pair => pair.Value)
-                                                       .Where(modState => modState.Active.Value)
-                                                       .Select(modState => modState.Mod)
-                                                       .ToArray();
+            var candidateSelection = allLocalAvailableMods.Where(modState => modState.Active.Value)
+                                                          .Select(modState => modState.Mod)
+                                                          .ToArray();
 
             // the following guard intends to check cases where we've already replaced potentially-external mod references with our own and avoid endless recursion.
             // TODO: replace custom comparer with System.Collections.Generic.ReferenceEqualityComparer when fully on .NET 6