From 8a2026e3053c9c8bbc7d46c25029fa3d7f7f0506 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 23 Jun 2021 21:26:52 +0900
Subject: [PATCH] Schedule callback instead

---
 osu.Game/Collections/CollectionManager.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index e6e8bedcf4..fe04c70d62 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -55,6 +55,8 @@ namespace osu.Game.Collections
         [BackgroundDependencyLoader]
         private void load()
         {
+            Collections.CollectionChanged += collectionsChanged;
+
             if (storage.Exists(database_backup_name))
             {
                 // If a backup file exists, it means the previous write operation didn't run to completion.
@@ -66,10 +68,6 @@ namespace osu.Game.Collections
                 File.Copy(storage.GetFullPath(database_backup_name), storage.GetFullPath(database_name));
             }
 
-            // Only accept changes after/if the above succeeds to prevent simultaneously accessing either file.
-            // Todo: This really should not be delayed like this, but is unlikely to cause issues because CollectionManager loads very early in execution.
-            Collections.CollectionChanged += collectionsChanged;
-
             if (storage.Exists(database_name))
             {
                 List<BeatmapCollection> beatmapCollections;
@@ -82,7 +80,7 @@ namespace osu.Game.Collections
             }
         }
 
-        private void collectionsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        private void collectionsChanged(object sender, NotifyCollectionChangedEventArgs e) => Schedule(() =>
         {
             switch (e.Action)
             {
@@ -106,7 +104,7 @@ namespace osu.Game.Collections
             }
 
             backgroundSave();
-        }
+        });
 
         /// <summary>
         /// Set an endpoint for notifications to be posted to.