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

Changed: Delete previously copied Ryzom Installer from TEMP directory, see #279

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-09-20 17:43:08 +02:00
parent b4f1f0868c
commit afb07586d3
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/ryzom/tools/client/ryzom_installer/src/main.cpp
View file

@ -149,8 +149,23 @@ int main(int argc, char *argv[])
QString tempPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation); QString tempPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
// check if launched from TEMP directory // check if launched from TEMP directory
if (step == Done && QApplication::applicationDirPath() != tempPath) if (step == Done && !QApplication::applicationDirPath().startsWith(tempPath))
{ {
// try to delete all temporary installers
QDir tempDir(tempPath);
QStringList filter;
filter << "ryzom_installer_*";
QStringList dirs = tempDir.entryList(filter, QDir::Dirs);
foreach(const QString &dir, dirs)
{
QDir(dir).removeRecursively();
}
tempPath += QString("/ryzom_installer_%1").arg(QDateTime::currentMSecsSinceEpoch());
// copy installer and required files to TEMP directory // copy installer and required files to TEMP directory
if (copyInstallerFiles(config.getInstallerRequiredFiles(), tempPath)) if (copyInstallerFiles(config.getInstallerRequiredFiles(), tempPath))
{ {