Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Try to load config file everytime, see #279

Browse source
This commit is contained in:
kervala 2016-08-14 13:28:50 +02:00
parent 43e8593735
commit 372d06c342
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
View file

@ -49,7 +49,12 @@ CConfigFile::~CConfigFile()
bool CConfigFile::load() bool CConfigFile::load()
{ {
// load default values // 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) bool CConfigFile::load(const QString &filename)