From 3e366b1f1545ca0f44e7b28bac1a82985e36b5f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 14:26:06 +0900
Subject: [PATCH] Ensure the main realm context is closed when the factory is
 disposed

---
 osu.Game.Tests/Database/TestRealmKeyBindingStore.cs |  1 +
 osu.Game/Database/RealmContextFactory.cs            | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/osu.Game.Tests/Database/TestRealmKeyBindingStore.cs b/osu.Game.Tests/Database/TestRealmKeyBindingStore.cs
index 6c0811f633..cac331451b 100644
--- a/osu.Game.Tests/Database/TestRealmKeyBindingStore.cs
+++ b/osu.Game.Tests/Database/TestRealmKeyBindingStore.cs
@@ -83,6 +83,7 @@ namespace osu.Game.Tests.Database
         [TearDown]
         public void TearDown()
         {
+            realmContextFactory.Dispose();
             storage.DeleteDirectory(string.Empty);
         }
 
diff --git a/osu.Game/Database/RealmContextFactory.cs b/osu.Game/Database/RealmContextFactory.cs
index 0631acc750..b76006cd88 100644
--- a/osu.Game/Database/RealmContextFactory.cs
+++ b/osu.Game/Database/RealmContextFactory.cs
@@ -36,6 +36,9 @@ namespace osu.Game.Database
         {
             get
             {
+                if (IsDisposed)
+                    throw new InvalidOperationException($"Attempted to access {nameof(Context)} on a disposed context factory");
+
                 if (context == null)
                 {
                     context = createContext();
@@ -92,6 +95,14 @@ namespace osu.Game.Database
         {
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            context?.Dispose();
+            context = null;
+        }
+
         /// <summary>
         /// A transaction used for making changes to realm data.
         /// </summary>