From ff16d2f490dc7836dd96728e4ffdb81b20db185c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Jan 2021 14:55:45 +0900
Subject: [PATCH] Mark classes nullable

---
 osu.Game/Database/RealmBackedStore.cs  |  6 ++++--
 osu.Game/Input/RealmKeyBindingStore.cs | 23 ++++++++++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Database/RealmBackedStore.cs b/osu.Game/Database/RealmBackedStore.cs
index e37831d9d5..4e58ef773b 100644
--- a/osu.Game/Database/RealmBackedStore.cs
+++ b/osu.Game/Database/RealmBackedStore.cs
@@ -3,15 +3,17 @@
 
 using osu.Framework.Platform;
 
+#nullable enable
+
 namespace osu.Game.Database
 {
     public abstract class RealmBackedStore
     {
-        protected readonly Storage Storage;
+        protected readonly Storage? Storage;
 
         protected readonly IRealmFactory ContextFactory;
 
-        protected RealmBackedStore(IRealmFactory contextFactory, Storage storage = null)
+        protected RealmBackedStore(IRealmFactory contextFactory, Storage? storage = null)
         {
             ContextFactory = contextFactory;
             Storage = storage;
diff --git a/osu.Game/Input/RealmKeyBindingStore.cs b/osu.Game/Input/RealmKeyBindingStore.cs
index fccd216e4d..95751306f3 100644
--- a/osu.Game/Input/RealmKeyBindingStore.cs
+++ b/osu.Game/Input/RealmKeyBindingStore.cs
@@ -10,6 +10,8 @@ using osu.Game.Database;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets;
 
+#nullable enable
+
 namespace osu.Game.Input
 {
     public class RealmKeyBindingStore : RealmBackedStore
@@ -17,19 +19,22 @@ namespace osu.Game.Input
         /// <summary>
         /// Fired whenever any key binding change occurs, across all rulesets and types.
         /// </summary>
-        public event Action KeyBindingChanged;
+        public event Action? KeyBindingChanged;
 
-        public RealmKeyBindingStore(RealmContextFactory contextFactory, RulesetStore rulesets, Storage storage = null)
+        public RealmKeyBindingStore(RealmContextFactory contextFactory, RulesetStore? rulesets, Storage? storage = null)
             : base(contextFactory, storage)
         {
-            // populate defaults from rulesets.
-            using (ContextFactory.GetForWrite())
+            if (rulesets != null)
             {
-                foreach (RulesetInfo info in rulesets.AvailableRulesets)
+                // populate defaults from rulesets.
+                using (ContextFactory.GetForWrite())
                 {
-                    var ruleset = info.CreateInstance();
-                    foreach (var variant in ruleset.AvailableVariants)
-                        insertDefaults(ruleset.GetDefaultKeyBindings(variant), info.ID, variant);
+                    foreach (RulesetInfo info in rulesets.AvailableRulesets)
+                    {
+                        var ruleset = info.CreateInstance();
+                        foreach (var variant in ruleset.AvailableVariants)
+                            insertDefaults(ruleset.GetDefaultKeyBindings(variant), info.ID, variant);
+                    }
                 }
             }
         }
@@ -87,7 +92,7 @@ namespace osu.Game.Input
         public void Update(IHasGuidPrimaryKey keyBinding, Action<IKeyBinding> modification)
         {
             // the incoming instance could already be a live access object.
-            Live<RealmKeyBinding> realmBinding = keyBinding as Live<RealmKeyBinding>;
+            Live<RealmKeyBinding>? realmBinding = keyBinding as Live<RealmKeyBinding>;
 
             using (var realm = ContextFactory.GetForWrite())
             {