Fix crash in GetEditorDisplayName when ININame starts with AI and Nam…

…e is null
CnCNet · Aug 22, 2023 · e3336ae · e3336ae
1 parent c009019
commit e3336ae
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/TSMapEditor/Models/GameObjectType.cs b/src/TSMapEditor/Models/GameObjectType.cs
@@ -22,12 +22,20 @@ public string GetEditorDisplayName()
         {
             string name;
 
-            if (string.IsNullOrWhiteSpace(FSName))
-                name = Name ?? ININame;
-            else
+            if (!string.IsNullOrWhiteSpace(FSName))
+            {
                 name = FSName;
+            }
+            else if (!string.IsNullOrWhiteSpace(Name))
+            {
+                name = Name;
+            }
+            else
+            {
+                return ININame;
+            }
 
-            if (ININame.StartsWith("AI") && !Name.StartsWith("AI"))
+            if (ININame.StartsWith("AI") && !name.StartsWith("AI "))
                 return "AI " + name;
 
             return name;