Fix InitEditorOverrides causing a NullReferenceException

CnCNet · Aug 28, 2023 · e1d82e9 · e1d82e9
1 parent bc7370c
commit e1d82e9
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/src/TSMapEditor/Models/Rules.cs b/src/TSMapEditor/Models/Rules.cs
@@ -143,19 +143,25 @@ public void InitEditorOverrides(IniFile iniFile)
             gameObjectTypes.AddRange(SmudgeTypes);
 
             var section = iniFile.GetSection("ObjectCategoryOverrides");
-            foreach (var keyValuePair in section.Keys)
+            if (section != null)
             {
-                var obj = gameObjectTypes.Find(o => o.ININame == keyValuePair.Key);
-                if (obj != null)
-                    obj.EditorCategory = keyValuePair.Value;
+                foreach (var keyValuePair in section.Keys)
+                {
+                    var obj = gameObjectTypes.Find(o => o.ININame == keyValuePair.Key);
+                    if (obj != null)
+                        obj.EditorCategory = keyValuePair.Value;
+                }
             }
 
             section = iniFile.GetSection("IgnoreTypes");
-            foreach (var keyValuePair in section.Keys)
+            if (section != null)
             {
-                var obj = gameObjectTypes.Find(o => o.ININame == keyValuePair.Key);
-                if (obj != null)
-                    obj.EditorVisible = !section.GetBooleanValue(keyValuePair.Key, !obj.EditorVisible);
+                foreach (var keyValuePair in section.Keys)
+                {
+                    var obj = gameObjectTypes.Find(o => o.ININame == keyValuePair.Key);
+                    if (obj != null)
+                        obj.EditorVisible = !section.GetBooleanValue(keyValuePair.Key, !obj.EditorVisible);
+                }
             }
         }