From a5088cac27c2d6955165efd45a86b68ed7952128 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Oct 2021 13:36:04 +0900
Subject: [PATCH] Fix default metadata propagation when no files are present

---
 osu.Game/Skinning/SkinInfo.cs    | 6 +++---
 osu.Game/Skinning/SkinManager.cs | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index 2bf8668ec6..3b34e23d57 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -18,12 +18,12 @@ namespace osu.Game.Skinning
 
         public int ID { get; set; }
 
-        public string Name { get; set; }
+        public string Name { get; set; } = string.Empty;
+
+        public string Creator { get; set; } = string.Empty;
 
         public string Hash { get; set; }
 
-        public string Creator { get; set; }
-
         public string InstantiationInfo { get; set; }
 
         public virtual Skin CreateInstance(IStorageResourceProvider resources)
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 304e48e854..fffdf19976 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Skinning
             CurrentSkinInfo.Value = ModelStore.ConsumableItems.Single(i => i.ID == chosen.ID);
         }
 
-        protected override SkinInfo CreateModel(ArchiveReader archive) => new SkinInfo { Name = archive.Name };
+        protected override SkinInfo CreateModel(ArchiveReader archive) => new SkinInfo { Name = archive.Name ?? "No name" };
 
         private const string unknown_creator_string = "Unknown";
 
@@ -163,6 +163,7 @@ namespace osu.Game.Skinning
 
             // LegacySkin will parse the skin.ini and populate `Skin.Configuration` during construction above.
             string skinIniSourcedName = instance.Configuration.SkinInfo.Name;
+            string skinIniSourcedCreator = instance.Configuration.SkinInfo.Creator;
             string archiveName = item.Name.Replace(".osk", "", StringComparison.OrdinalIgnoreCase);
 
             bool isImport = reader != null;
@@ -170,7 +171,7 @@ namespace osu.Game.Skinning
             if (isImport)
             {
                 item.Name = !string.IsNullOrEmpty(skinIniSourcedName) ? skinIniSourcedName : archiveName;
-                item.Creator = instance.Configuration.SkinInfo.Creator ?? unknown_creator_string;
+                item.Creator = !string.IsNullOrEmpty(skinIniSourcedCreator) ? skinIniSourcedCreator : unknown_creator_string;
 
                 // For imports, we want to use the archive or folder name as part of the metadata, in addition to any existing skin.ini metadata.
                 // In an ideal world, skin.ini would be the only source of metadata, but a lot of skin creators and users don't update it when making modifications.