load global settings before modulemanager

this will totally not break anything
LatiteClient · Aug 25, 2024 · 0d428ae · 0d428ae
1 parent 5f4d0c6
commit 0d428ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/client/Latite.cpp b/src/client/Latite.cpp
@@ -246,7 +246,8 @@ DWORD __stdcall startThread(HINSTANCE dll) {
         Logger::Info(XOR_STRING("Loaded master config"));
     }
 
-
+    Latite::get().initSettings();
+    Latite::getConfigManager().applyGlobalConfig();
 
     new (mmgrBuf) ModuleManager;
     new (commandMgrBuf) CommandManager;
@@ -287,9 +288,6 @@ DWORD __stdcall startThread(HINSTANCE dll) {
         std::this_thread::sleep_for(10ms);
     }
 
-    Latite::get().initSettings();
-    Latite::getConfigManager().applyGlobalConfig();
-
     Latite::get().initialize(dll);
 
     Logger::Info(XOR_STRING("Initialized Latite Client"));

diff --git a/src/client/script/class/impl/JsModuleClass.cpp b/src/client/script/class/impl/JsModuleClass.cpp
@@ -293,9 +293,10 @@ JsValueRef JsModuleClass::moduleAddEnumSetting(JsValueRef callee, bool isConstru
 	for (int i = 0; i < Chakra::GetIntProperty(values, L"length"); i++) {
 		JsValueRef obj = JS_INVALID_REFERENCE;
 		JS::JsGetIndexedProperty(values, Chakra::MakeInt(i), &obj);
-		auto entryName = Chakra::GetStringProperty(obj, L"name");
-		auto entryDesc = Chakra::GetStringProperty(obj, L"desc");
+
 		if (obj != JS_INVALID_REFERENCE) {
+			auto entryName = Chakra::GetStringProperty(obj, L"name");
+			auto entryDesc = Chakra::GetStringProperty(obj, L"desc");
 			set->enumData->addEntry(EnumEntry{ i, entryName, entryDesc });
 		}
 	}