Fix custom map launch crash caused by missing UntranslatedName when m…

…ap is loaded from cache
CnCNet · Jul 28, 2023 · da6aa4d · da6aa4d
1 parent a8ed284
commit da6aa4d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/DXMainClient/Domain/Multiplayer/Map.cs b/DXMainClient/Domain/Multiplayer/Map.cs
@@ -635,6 +635,13 @@ public bool SetInfoFromCustomMap()
             }
         }
 
+        // Ran after the map has been loaded from cache if it is a custom map.
+        public void AfterDeserialize()
+        {
+            CalculateSHA();
+            UntranslatedName = Name;
+        }
+
         private void ParseForcedOptions(IniFile iniFile, string forcedOptionsSection)
         {
             List<string> keys = iniFile.GetSectionKeys(forcedOptionsSection);

diff --git a/DXMainClient/Domain/Multiplayer/MapLoader.cs b/DXMainClient/Domain/Multiplayer/MapLoader.cs
@@ -235,7 +235,7 @@ private ConcurrentDictionary<string, Map> LoadCustomMapCache()
                     ? customMapCache.Maps : new ConcurrentDictionary<string, Map>();
 
                 foreach (var customMap in customMaps.Values)
-                    customMap.CalculateSHA();
+                    customMap.AfterDeserialize();
 
                 return customMaps;
             }