fix init

jackhumbert · Jul 23, 2022 · 7c1aae4 · 7c1aae4
1 parent b83ae34
commit 7c1aae4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/build/red4ext/plugins/mod_settings/mod_settings.dll b/build/red4ext/plugins/mod_settings/mod_settings.dll
diff --git a/src/red4ext/ModSettings.cpp b/src/red4ext/ModSettings.cpp
@@ -45,7 +45,7 @@ void ModSettings::AddVariable(ModSettingsVariable *variable) {
   std::shared_lock<RED4ext::SharedMutex> _(self->variables_lock);
   variable->listeners = RED4ext::DynArray<RED4ext::IScriptable*>(new RED4ext::Memory::DefaultAllocator());
   variable->listeners.Reserve(1000);
-
+  variable->UpdateValues();
   self->variables.EmplaceBack(variable);
 
   auto modVars = self->variablesByMod.Get(variable->mod);

diff --git a/src/red4ext/ModSettingsVariable.cpp b/src/red4ext/ModSettingsVariable.cpp
@@ -2,20 +2,20 @@
 #include "ModRuntimeSettingsVar.hpp"
 
 void ModSettingsVariable::UpdateValues() {
+  auto classType = RED4ext::CRTTISystem::Get()->GetClass(className);
+  auto valuePtr = settingsVar->GetValuePtr();
+  for (auto i = 0; i < classType->propertiesWithDefaults.size; i++) {
+    if (classType->propertiesWithDefaults[i] == settingsVar->name) {
+      uint64_t addr = classType->defaultValues[i]->type;
+      auto propType = reinterpret_cast<RED4ext::CBaseRTTIType *>(addr & 0xFFFFFFFFFFFFFFF8);
+      propType->Assign(&classType->defaultValues[i]->value, valuePtr);
+    }
+  }
   std::shared_lock<RED4ext::SharedMutex> _(listeners_lock);
   for (auto &listener : listeners) {
     if (listener && !listener->ref.Expired()) {
-      auto classType = RED4ext::CRTTISystem::Get()->GetClass(className);
-      auto valuePtr = settingsVar->GetValuePtr();
-      for (auto i = 0; i < classType->propertiesWithDefaults.size; i++) {
-        if (classType->propertiesWithDefaults[i] == settingsVar->name) {
-          uint64_t addr = classType->defaultValues[i]->type;
-          auto propType =  reinterpret_cast<RED4ext::CBaseRTTIType *>(addr & 0xFFFFFFFFFFFFFFF8);
-          propType->Assign(&classType->defaultValues[i]->value, valuePtr);
-        }
-      }
       auto prop = classType->propertiesByName.Get(settingsVar->name);
-      if (prop) {
+      if (prop && *prop) {
         (*prop)->SetValue(listener, valuePtr);
       }
     }