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

Changed: QDir.cd already checks if directory exists, see #279

Browse source
This commit is contained in:
kervala 2016-09-03 10:14:06 +02:00
parent 34df094f24
commit 8e05b80b18
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -679,7 +679,7 @@ bool CConfigFile::foundTemporaryFiles(const QString &directory) const
// directory doesn't exist // directory doesn't exist
if (!dir.exists()) return false; if (!dir.exists()) return false;
if (!dir.cd("data") && dir.exists()) return false; if (!dir.cd("data")) return false;
QStringList filter; QStringList filter;
filter << "*.string_cache"; filter << "*.string_cache";
@ -695,7 +695,7 @@ bool CConfigFile::foundTemporaryFiles(const QString &directory) const
if (!dir.entryList(filter, QDir::Files).isEmpty()) return true; if (!dir.entryList(filter, QDir::Files).isEmpty()) return true;
// fonts directory is not needed anymore // fonts directory is not needed anymore
if (dir.exists("fonts.bnp") && dir.cd("fonts") && dir.exists()) return true; if (dir.exists("fonts.bnp") && !dir.cd("fonts")) return true;
return false; return false;
} }

4
code/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp
View file

@ -46,7 +46,7 @@ bool CFilesCleaner::exec()
// directory doesn't exist // directory doesn't exist
if (!dir.exists()) return false; if (!dir.exists()) return false;
if (!dir.cd("data") && dir.exists()) return false; if (!dir.cd("data")) return false;
QStringList filter; QStringList filter;
filter << "*.string_cache"; filter << "*.string_cache";
@ -79,7 +79,7 @@ bool CFilesCleaner::exec()
} }
// fonts directory is not needed anymore if fonts.bnp exists // fonts directory is not needed anymore if fonts.bnp exists
if (dir.exists("fonts.bnp") && dir.cd("fonts") && dir.exists()) if (dir.exists("fonts.bnp") && dir.cd("fonts"))
{ {
dir.removeRecursively(); dir.removeRecursively();
} }