From 5e7993c35afaae58a3dec41dddd0463b4e07a53a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Jan 2022 20:38:34 +0900
Subject: [PATCH] Post disposal to synchronisation context

---
 osu.Game/Database/RealmContextFactory.cs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Database/RealmContextFactory.cs b/osu.Game/Database/RealmContextFactory.cs
index 32f7ac99c1..26943c1951 100644
--- a/osu.Game/Database/RealmContextFactory.cs
+++ b/osu.Game/Database/RealmContextFactory.cs
@@ -260,19 +260,29 @@ namespace osu.Game.Database
             if (!ThreadSafety.IsUpdateThread)
                 throw new InvalidOperationException(@$"{nameof(Register)} must be called from the update thread.");
 
+            var syncContext = SynchronizationContext.Current;
+
             registerSubscription(action);
 
             // This token is returned to the consumer only.
             // It will cause the registration to be permanently removed.
             return new InvokeOnDisposal(() =>
             {
-                lock (contextLock)
+                if (ThreadSafety.IsUpdateThread)
+                    unsubscribe();
+                else
+                    syncContext.Post(_ => unsubscribe(), null);
+
+                void unsubscribe()
                 {
-                    if (customSubscriptionActions.TryGetValue(action, out var unsubscriptionAction))
+                    lock (contextLock)
                     {
-                        unsubscriptionAction?.Dispose();
-                        customSubscriptionActions.Remove(action);
-                        realmSubscriptionsResetMap.Remove(action);
+                        if (customSubscriptionActions.TryGetValue(action, out var unsubscriptionAction))
+                        {
+                            unsubscriptionAction?.Dispose();
+                            customSubscriptionActions.Remove(action);
+                            realmSubscriptionsResetMap.Remove(action);
+                        }
                     }
                 }
             });