mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 10:23:51 +00:00
Code Issues Releases Wiki Activity

Partially revert 3a912485

Browse source 
While it solved the bug it was supposed to, it caused a regression where
the user config could no longer override the global config.
This commit is contained in:
AnyOldName3 2020-10-22 21:38:22 +01:00
parent 43614e2204
commit 6c311f4a3d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/files/configurationmanager.cpp
View file

@ -59,6 +59,10 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
bool silent = mSilent; bool silent = mSilent;
mSilent = quiet; mSilent = quiet;
// User config has the highest priority.
loadConfig(mFixedPath.getUserConfigPath(), variables, description);
boost::program_options::notify(variables);
// read either local or global config depending on type of installation // read either local or global config depending on type of installation
bool loaded = loadConfig(mFixedPath.getLocalPath(), variables, description); bool loaded = loadConfig(mFixedPath.getLocalPath(), variables, description);
boost::program_options::notify(variables); boost::program_options::notify(variables);
@ -68,10 +72,6 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
boost::program_options::notify(variables); boost::program_options::notify(variables);
} }
// User config has the highest priority.
loadConfig(mFixedPath.getUserConfigPath(), variables, description);
boost::program_options::notify(variables);
mSilent = silent; mSilent = silent;
} }