mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-09 21:44:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_cs_start' into 'master'

Browse Source 
Do not initialize settings storage for editor

See merge request OpenMW/openmw!2917
This commit is contained in:
psi29a 2023-04-11 06:53:21 +00:00
commit 15c83cafe0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/settings/settings.cpp
View File

@ -147,7 +147,8 @@ namespace Settings
if (std::filesystem::exists(settingspath)) if (std::filesystem::exists(settingspath))
parser.loadSettingsFile(settingspath, mUserSettings, false, false); parser.loadSettingsFile(settingspath, mUserSettings, false, false);
Settings::Values::init(); if (!loadEditorSettings)
Settings::Values::init();
for (const auto& [key, value] : originalDefaultSettings) for (const auto& [key, value] : originalDefaultSettings)
if (!sInitialized.contains(key)) if (!sInitialized.contains(key))