From e80ef341d2663ea07c272154b8ddb1e0bde13467 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 1 Sep 2020 15:50:08 +0900
Subject: [PATCH] Allow UpdateFile to be called when a previous file doesn't
 exist

---
 osu.Game/Database/ArchiveModelManager.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 915d980d24..49d7edd56c 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -397,15 +397,24 @@ namespace osu.Game.Database
             }
         }
 
+        /// <summary>
+        /// Update an existing file, or create a new entry if not already part of the <paramref name="model"/>'s files.
+        /// </summary>
+        /// <param name="model">The item to operate on.</param>
+        /// <param name="file">The file model to be updated or added.</param>
+        /// <param name="contents">The new file contents.</param>
         public void UpdateFile(TModel model, TFileModel file, Stream contents)
         {
             using (var usage = ContextFactory.GetForWrite())
             {
                 // Dereference the existing file info, since the file model will be removed.
-                Files.Dereference(file.FileInfo);
+                if (file.FileInfo != null)
+                {
+                    Files.Dereference(file.FileInfo);
 
-                // Remove the file model.
-                usage.Context.Set<TFileModel>().Remove(file);
+                    // Remove the file model.
+                    usage.Context.Set<TFileModel>().Remove(file);
+                }
 
                 // Add the new file info and containing file model.
                 model.Files.Remove(file);