From 6c311f4a3d9a0c6bdc88371563962f4d2ea08a14 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Thu, 22 Oct 2020 21:38:22 +0100 Subject: [PATCH] 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. --- components/files/configurationmanager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp index 0ba2d15193..c74c399224 100644 --- a/components/files/configurationmanager.cpp +++ b/components/files/configurationmanager.cpp @@ -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; }