From 90f0bc87f5002b0479ec01508584c637d042358f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Jun 2021 16:12:21 +0900
Subject: [PATCH] Add safety against double disposal

---
 osu.Game/Database/RealmContextFactory.cs | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Database/RealmContextFactory.cs b/osu.Game/Database/RealmContextFactory.cs
index 461444870e..0b0263a16b 100644
--- a/osu.Game/Database/RealmContextFactory.cs
+++ b/osu.Game/Database/RealmContextFactory.cs
@@ -126,22 +126,28 @@ namespace osu.Game.Database
 
         protected override void Dispose(bool isDisposing)
         {
-            base.Dispose(isDisposing);
+            if (!IsDisposed)
+            {
+                // intentionally block all operations indefinitely. this ensures that nothing can start consuming a new context after disposal.
+                BlockAllOperations();
+                blockingLock?.Dispose();
+            }
 
-            // intentionally block all operations indefinitely. this ensures that nothing can start consuming a new context after disposal.
-            BlockAllOperations();
-            blockingLock?.Dispose();
+            base.Dispose(isDisposing);
         }
 
         public IDisposable BlockAllOperations()
         {
+            if (IsDisposed)
+                throw new InvalidOperationException(@"Attempted to block operations after already disposed.");
+
             blockingLock.Wait();
             flushContexts();
 
             return new InvokeOnDisposal<RealmContextFactory>(this, endBlockingSection);
-        }
 
-        private static void endBlockingSection(RealmContextFactory factory) => factory.blockingLock.Release();
+            static void endBlockingSection(RealmContextFactory factory) => factory.blockingLock.Release();
+        }
 
         private void flushContexts()
         {