From 81b5717ae793e334fdcf8efd72d20debfb49e9ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Jan 2022 17:33:03 +0900
Subject: [PATCH] Fix `RealmLive` failing to retrieve due to lack of refresh

---
 osu.Game/Database/RealmLive.cs | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Database/RealmLive.cs b/osu.Game/Database/RealmLive.cs
index 75d84d7cf1..df5e165f8e 100644
--- a/osu.Game/Database/RealmLive.cs
+++ b/osu.Game/Database/RealmLive.cs
@@ -53,18 +53,7 @@ namespace osu.Game.Database
 
             realmFactory.Run(realm =>
             {
-                var found = realm.Find<T>(ID);
-
-                if (found == null)
-                {
-                    // It may be that we access this from the update thread before a refresh has taken place.
-                    // To ensure that behaviour matches what we'd expect (the object *is* available), force
-                    // a refresh to bring in any off-thread changes immediately.
-                    realm.Refresh();
-                    found = realm.Find<T>(ID);
-                }
-
-                perform(found);
+                perform(retrieveFromID(realm, ID));
             });
         }
 
@@ -79,7 +68,7 @@ namespace osu.Game.Database
 
             return realmFactory.Run(realm =>
             {
-                var returnData = perform(realm.Find<T>(ID));
+                var returnData = perform(retrieveFromID(realm, ID));
 
                 if (returnData is RealmObjectBase realmObject && realmObject.IsManaged)
                     throw new InvalidOperationException(@$"Managed realm objects should not exit the scope of {nameof(PerformRead)}.");
@@ -119,6 +108,22 @@ namespace osu.Game.Database
             }
         }
 
+        private T retrieveFromID(Realm realm, Guid id)
+        {
+            var found = realm.Find<T>(ID);
+
+            if (found == null)
+            {
+                // It may be that we access this from the update thread before a refresh has taken place.
+                // To ensure that behaviour matches what we'd expect (the object *is* available), force
+                // a refresh to bring in any off-thread changes immediately.
+                realm.Refresh();
+                found = realm.Find<T>(ID);
+            }
+
+            return found;
+        }
+
         public bool Equals(ILive<T>? other) => ID == other?.ID;
 
         public override string ToString() => PerformRead(i => i.ToString());