Partially revert 3a912485

While it solved the bug it was supposed to, it caused a regression where
the user config could no longer override the global config.
pull/593/head
AnyOldName3 4 years ago
parent 43614e2204
commit 6c311f4a3d

@ -59,6 +59,10 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
bool silent = mSilent;
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
bool loaded = loadConfig(mFixedPath.getLocalPath(), variables, description);
boost::program_options::notify(variables);
@ -68,10 +72,6 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
boost::program_options::notify(variables);
}
// User config has the highest priority.
loadConfig(mFixedPath.getUserConfigPath(), variables, description);
boost::program_options::notify(variables);
mSilent = silent;
}

Loading…
Cancel
Save