mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Remove debugging lines

Browse Source
This commit is contained in:
AnyOldName3 2020-10-23 01:46:49 +01:00
parent cf81f1bbb7
commit fca8634b74
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/files/configurationmanager.cpp
View File

@ -62,21 +62,18 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
// User config has the highest priority.
auto composingVariables = separateComposingVariables(variables, description);
Log(Debug::Info) << composingVariables.size() << " composing variables were loaded before the user config";
loadConfig(mFixedPath.getUserConfigPath(), variables, description);
mergeComposingVariables(variables, composingVariables, description);
boost::program_options::notify(variables);
// read either local or global config depending on type of installation
composingVariables = separateComposingVariables(variables, description);
Log(Debug::Info) << composingVariables.size() << " composing variables were loaded before the local config";
bool loaded = loadConfig(mFixedPath.getLocalPath(), variables, description);
mergeComposingVariables(variables, composingVariables, description);
boost::program_options::notify(variables);
if (!loaded)
{
composingVariables = separateComposingVariables(variables, description);
Log(Debug::Info) << composingVariables.size() << " composing variables were loaded before the global config";
loadConfig(mFixedPath.getGlobalConfigPath(), variables, description);
mergeComposingVariables(variables, composingVariables, description);
boost::program_options::notify(variables);