From edb1230111ef1cc1680ee1a032dc1ca951e8fcef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 16 Sep 2021 22:48:09 +0900
Subject: [PATCH] Fix potential nullref throw on failed startup

---
 osu.Game/Database/DatabaseContextFactory.cs | 7 +++++--
 osu.Game/OsuGameBase.cs                     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/DatabaseContextFactory.cs b/osu.Game/Database/DatabaseContextFactory.cs
index 1cceb59b11..d402195f29 100644
--- a/osu.Game/Database/DatabaseContextFactory.cs
+++ b/osu.Game/Database/DatabaseContextFactory.cs
@@ -163,8 +163,11 @@ public void ResetDatabase()
 
         public void FlushConnections()
         {
-            foreach (var context in threadContexts.Values)
-                context.Dispose();
+            if (threadContexts != null)
+            {
+                foreach (var context in threadContexts.Values)
+                    context.Dispose();
+            }
 
             recycleThreadContexts();
         }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 59a05aec4f..7aa460981a 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -527,7 +527,7 @@ protected override void Dispose(bool isDisposing)
             BeatmapManager?.Dispose();
             LocalConfig?.Dispose();
 
-            contextFactory.FlushConnections();
+            contextFactory?.FlushConnections();
         }
     }
 }