Merge branch 'master' into Third-party-ruleset-filter-fix

osu.Game/Collections/CollectionManager.cs

@@ -50,9 +50,14 @@ namespace osu.Game.Collections
             this.storage = storage;
         }
 
+        [Resolved(canBeNull: true)]
+        private DatabaseContextFactory efContextFactory { get; set; } = null!;
+
         [BackgroundDependencyLoader]
         private void load()
         {
+            efContextFactory?.WaitForMigrationCompletion();
+
             Collections.CollectionChanged += collectionsChanged;
 
             if (storage.Exists(database_backup_name))

osu.Game/Database/DatabaseContextFactory.cs

@@ -184,5 +184,11 @@ namespace osu.Game.Database
         }
 
         public static string CreateDatabaseConnectionString(string filename, Storage storage) => string.Concat("Data Source=", storage.GetFullPath($@"{filename}", true));
+
+        private readonly ManualResetEventSlim migrationComplete = new ManualResetEventSlim();
+
+        public void SetMigrationCompletion() => migrationComplete.Set();
+
+        public void WaitForMigrationCompletion() => migrationComplete.Wait();
     }
 }

osu.Game/Database/EFToRealmMigrator.cs

@@ -128,6 +128,7 @@ namespace osu.Game.Database
             }, TaskCreationOptions.LongRunning).ContinueWith(t =>
             {
                 migrationCompleted.SetResult(true);
+                efContextFactory.SetMigrationCompletion();
             });
         }