From 78efe0a895753cc07e6c8392d00b7e348732b898 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 14 Aug 2016 13:28:50 +0200 Subject: [PATCH] Changed: Try to load config file everytime, see #279 --HG-- branch : develop --- code/ryzom/tools/client/ryzom_installer/src/configfile.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp index 241dbeed0..f59ee44df 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -49,7 +49,12 @@ CConfigFile::~CConfigFile() bool CConfigFile::load() { // load default values - return load(m_defaultConfigPath) || load(m_configPath); + if (!load(m_defaultConfigPath)) return false; + + // ignore return value, since we'll always have valid values + load(m_configPath); + + return true; } bool CConfigFile::load(const QString &filename)