From 1a7e23b5c1d422941a749902e42c25b837978480 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 21 Oct 2017 23:39:31 +0900
Subject: [PATCH] Don't query database on keypress

---
 .../Input/Bindings/DatabasedKeyBindingInputManager.cs    | 9 +++++++--
 osu.Game/Input/KeyBindingStore.cs                        | 7 ++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Input/Bindings/DatabasedKeyBindingInputManager.cs b/osu.Game/Input/Bindings/DatabasedKeyBindingInputManager.cs
index 8a3c65a35e..6dedf7385b 100644
--- a/osu.Game/Input/Bindings/DatabasedKeyBindingInputManager.cs
+++ b/osu.Game/Input/Bindings/DatabasedKeyBindingInputManager.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets;
+using System.Linq;
 
 namespace osu.Game.Input.Bindings
 {
@@ -44,11 +45,15 @@ namespace osu.Game.Input.Bindings
         private void load(KeyBindingStore keyBindings)
         {
             store = keyBindings;
+            store.KeyBindingChanged += ReloadMappings;
         }
 
-        protected override void ReloadMappings()
+        protected override void Dispose(bool isDisposing)
         {
-            KeyBindings = store.Query(ruleset?.ID, variant);
+            base.Dispose(isDisposing);
+            store.KeyBindingChanged -= ReloadMappings;
         }
+
+        protected override void ReloadMappings() => KeyBindings = store.Query(ruleset?.ID, variant).ToList();
     }
 }
diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index bebbb471ac..07c0319f2f 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Input
 {
     public class KeyBindingStore : DatabaseBackedStore
     {
+        public event Action KeyBindingChanged;
+
         public KeyBindingStore(Func<OsuDbContext> getContext, RulesetStore rulesets, Storage storage = null)
             : base(getContext, storage)
         {
@@ -59,7 +61,8 @@ namespace osu.Game.Input
                         });
                 }
 
-                context.SaveChanges(transaction);
+                context.SaveChanges();
+                transaction.Commit();
             }
         }
 
@@ -79,6 +82,8 @@ namespace osu.Game.Input
             var context = GetContext();
             context.Update(keyBinding);
             context.SaveChanges();
+
+            KeyBindingChanged?.Invoke();
         }
     }
 }