Fix potential nullref throw on failed startup

ppy · Sep 16, 2021 · edb1230 · edb1230
1 parent b399f91
commit edb1230
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -527,7 +527,7 @@ protected override void Dispose(bool isDisposing)
             BeatmapManager?.Dispose();
             LocalConfig?.Dispose();
 
-            contextFactory.FlushConnections();
+            contextFactory?.FlushConnections();
         }
     }
 }