mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-19 20:53:52 +00:00
Remove debugging lines
This commit is contained in:
parent
cf81f1bbb7
commit
fca8634b74
1 changed files with 0 additions and 3 deletions
|
@ -62,21 +62,18 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
|
||||||
|
|
||||||
// User config has the highest priority.
|
// User config has the highest priority.
|
||||||
auto composingVariables = separateComposingVariables(variables, description);
|
auto composingVariables = separateComposingVariables(variables, description);
|
||||||
Log(Debug::Info) << composingVariables.size() << " composing variables were loaded before the user config";
|
|
||||||
loadConfig(mFixedPath.getUserConfigPath(), variables, description);
|
loadConfig(mFixedPath.getUserConfigPath(), variables, description);
|
||||||
mergeComposingVariables(variables, composingVariables, description);
|
mergeComposingVariables(variables, composingVariables, description);
|
||||||
boost::program_options::notify(variables);
|
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
|
||||||
composingVariables = separateComposingVariables(variables, description);
|
composingVariables = separateComposingVariables(variables, description);
|
||||||
Log(Debug::Info) << composingVariables.size() << " composing variables were loaded before the local config";
|
|
||||||
bool loaded = loadConfig(mFixedPath.getLocalPath(), variables, description);
|
bool loaded = loadConfig(mFixedPath.getLocalPath(), variables, description);
|
||||||
mergeComposingVariables(variables, composingVariables, description);
|
mergeComposingVariables(variables, composingVariables, description);
|
||||||
boost::program_options::notify(variables);
|
boost::program_options::notify(variables);
|
||||||
if (!loaded)
|
if (!loaded)
|
||||||
{
|
{
|
||||||
composingVariables = separateComposingVariables(variables, description);
|
composingVariables = separateComposingVariables(variables, description);
|
||||||
Log(Debug::Info) << composingVariables.size() << " composing variables were loaded before the global config";
|
|
||||||
loadConfig(mFixedPath.getGlobalConfigPath(), variables, description);
|
loadConfig(mFixedPath.getGlobalConfigPath(), variables, description);
|
||||||
mergeComposingVariables(variables, composingVariables, description);
|
mergeComposingVariables(variables, composingVariables, description);
|
||||||
boost::program_options::notify(variables);
|
boost::program_options::notify(variables);
|
||||||
|
|
Loading…
Reference in a new issue