Guard GroupCenter dbKey against null CBs, abort Spawn if empty key. C…

…lose #14
KSP-RO · Aug 27, 2023 · d01c4c0 · d01c4c0
1 parent 65a4f89
commit d01c4c0
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Core/StaticGroup/GroupCenter.cs b/src/Core/StaticGroup/GroupCenter.cs
@@ -81,11 +81,15 @@ internal bool isHidden
         internal void Spawn()
         {
 
-            if (StaticDatabase.HasGroupCenter(dbKey))
+            var key = dbKey;
+            if (string.IsNullOrEmpty(key))
+                return;
+
+            if (StaticDatabase.HasGroupCenter(key))
             {
                 string oldName = Group;
                 int index = 0;
-                while (StaticDatabase.HasGroupCenter(dbKey))
+                while (StaticDatabase.HasGroupCenter(key))
                 {
                     Group = oldName + "_" + index.ToString();
                     index++;
@@ -472,6 +476,9 @@ internal string dbKey
         {
             get
             {
+                var cb = CelestialBody;
+                if (cb == null)
+                    return string.Empty;
                 return (CelestialBody.name + "_" + Group);
             }
         }