From d06e52505a9b8105a8683ea31506a96f69528d26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Jun 2021 17:01:51 +0900
Subject: [PATCH] Fix thread safety of
 `KeyBindingStore.GetReadableKeyCombinationsFor`

---
 osu.Game/Input/RealmKeyBindingStore.cs | 21 ++++++++++++++-------
 osu.Game/OsuGame.cs                    |  4 ++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Input/RealmKeyBindingStore.cs b/osu.Game/Input/RealmKeyBindingStore.cs
index e2efd546e7..45b7cf355f 100644
--- a/osu.Game/Input/RealmKeyBindingStore.cs
+++ b/osu.Game/Input/RealmKeyBindingStore.cs
@@ -26,16 +26,23 @@ namespace osu.Game.Input
         /// </summary>
         /// <param name="globalAction">The action to lookup.</param>
         /// <returns>A set of display strings for all the user's key configuration for the action.</returns>
-        public IEnumerable<string> GetReadableKeyCombinationsFor(GlobalAction globalAction)
+        public IReadOnlyList<string> GetReadableKeyCombinationsFor(GlobalAction globalAction)
         {
-            foreach (var action in realmFactory.Context.All<RealmKeyBinding>().Where(b => (GlobalAction)b.ActionInt == globalAction))
-            {
-                string str = action.KeyCombination.ReadableString();
+            List<string> combinations = new List<string>();
 
-                // even if found, the readable string may be empty for an unbound action.
-                if (str.Length > 0)
-                    yield return str;
+            using (var context = realmFactory.GetForRead())
+            {
+                foreach (var action in context.Realm.All<RealmKeyBinding>().Where(b => (GlobalAction)b.ActionInt == globalAction))
+                {
+                    string str = action.KeyCombination.ReadableString();
+
+                    // even if found, the readable string may be empty for an unbound action.
+                    if (str.Length > 0)
+                        combinations.Add(str);
+                }
             }
+
+            return combinations;
         }
 
         /// <summary>
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 0c4d035728..907794d3bb 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -608,9 +608,9 @@ namespace osu.Game
 
             LocalConfig.LookupKeyBindings = l =>
             {
-                var combinations = KeyBindingStore.GetReadableKeyCombinationsFor(l).ToArray();
+                var combinations = KeyBindingStore.GetReadableKeyCombinationsFor(l);
 
-                if (combinations.Length == 0)
+                if (combinations.Count == 0)
                     return "none";
 
                 return string.Join(" or ", combinations);