mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-02 16:20:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'original_default_settings' into 'master'

Browse Source 
Check only original default settings

See merge request OpenMW/openmw!2913
This commit is contained in:
psi29a 2023-04-10 15:33:33 +00:00
commit 087050eddf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/settings/settings.cpp
View File

@ -130,6 +130,8 @@ namespace Settings
+ "\" was properly installed."); + "\" was properly installed.");
parser.loadSettingsFile(defaultsBin, mDefaultSettings, true, false); parser.loadSettingsFile(defaultsBin, mDefaultSettings, true, false);
const CategorySettingValueMap originalDefaultSettings = mDefaultSettings;
// Load "settings.cfg" or "openmw-cs.cfg" from every config dir except the last one as additional default // Load "settings.cfg" or "openmw-cs.cfg" from every config dir except the last one as additional default
// settings. // settings.
for (int i = 0; i < static_cast<int>(paths.size()) - 1; ++i) for (int i = 0; i < static_cast<int>(paths.size()) - 1; ++i)
@ -147,7 +149,7 @@ namespace Settings
Settings::Values::init(); Settings::Values::init();
for (const auto& [key, value] : mDefaultSettings) for (const auto& [key, value] : originalDefaultSettings)
if (!sInitialized.contains(key)) if (!sInitialized.contains(key))
throw std::runtime_error("Default setting [" + key.first + "] " + key.second + " is not initialized"); throw std::runtime_error("Default setting [" + key.first + "] " + key.second + " is not initialized");