mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-04-18 14:42:27 +00:00
Merge branch 'fix_cs_start' into 'master'
Do not initialize settings storage for editor See merge request OpenMW/openmw!2917
This commit is contained in:
commit
15c83cafe0
@ -147,6 +147,7 @@ namespace Settings
|
|||||||
if (std::filesystem::exists(settingspath))
|
if (std::filesystem::exists(settingspath))
|
||||||
parser.loadSettingsFile(settingspath, mUserSettings, false, false);
|
parser.loadSettingsFile(settingspath, mUserSettings, false, false);
|
||||||
|
|
||||||
|
if (!loadEditorSettings)
|
||||||
Settings::Values::init();
|
Settings::Values::init();
|
||||||
|
|
||||||
for (const auto& [key, value] : originalDefaultSettings)
|
for (const auto& [key, value] : originalDefaultSettings)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user