- fix wrong init handling of cvars caught in test

gscept · Dec 7, 2024 · d35e12a · d35e12a
1 parent 0d524ac
commit d35e12a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/code/foundation/core/cvar.cc b/code/foundation/core/cvar.cc
@@ -40,13 +40,13 @@ CVar*
 CVarCreate(CVarCreateInfo const& info)
 {
     CVar* ptr = CVarGet(info.name);
+    const bool needsInit = (ptr == nullptr);
     if (ptr == nullptr)
     {
         IndexT varIndex = cVarOffset++;
         n_assert(varIndex < MAX_CVARS);
         ptr = &cVars[varIndex];
         cVarTable.Add(info.name, varIndex);
-        CVarParseWrite(ptr, info.defaultValue);
     }
     n_assert2(!Util::String(info.name).ContainsCharFromSet(" "), "CVar name cannot contain spaces.");
 
@@ -57,6 +57,10 @@ CVarCreate(CVarCreateInfo const& info)
     {
         ptr->description = info.description;
     }
+    if (needsInit)
+    {
+        CVarParseWrite(ptr, info.defaultValue);
+    }
     return ptr;
 }