aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-12-26 18:40:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2016-10-19 09:52:38 +02:00
parent f2907587c4
commit 33e1dedbf1
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -725,23 +725,18 @@ void COperationDialog::copyInstaller()
m_currentOperation = tr("Copying installer to new location..."); m_currentOperation = tr("Copying installer to new location...");
QString destinationDirectory = config->getInstallationDirectory();
// rename old client to installer
QString oldInstallerFullPath = config->getInstallerCurrentFilePath();
QString newInstallerFullPath = config->getInstallerInstalledFilePath(); QString newInstallerFullPath = config->getInstallerInstalledFilePath();
if (!newInstallerFullPath.isEmpty()) if (!newInstallerFullPath.isEmpty())
{ {
QString srcDir = config->getSrcServerDirectory(); QString destinationDirectory = config->getInstallationDirectory();
QString oldInstallerFullPath = config->getInstallerCurrentFilePath();
if (srcDir.isEmpty()) srcDir = config->getInstallerCurrentDirPath(); QString srcDir = config->getInstallerCurrentDirPath();
// always copy new installers // always copy new installers
CFilesCopier copier(this); CFilesCopier copier(this);
copier.setIncludeFilter(config->getInstallerRequiredFiles()); copier.setIncludeFilter(config->getInstallerRequiredFiles());
#ifdef Q_OS_WIN32 #ifndef Q_OS_MAC
copier.addFile(oldInstallerFullPath); copier.addFile(oldInstallerFullPath);
#endif #endif
copier.setSourceDirectory(srcDir); copier.setSourceDirectory(srcDir);
@ -749,9 +744,7 @@ void COperationDialog::copyInstaller()
if (!copier.exec()) return; if (!copier.exec()) return;
#ifdef Q_OS_WIN32 #ifndef Q_OS_MAC
// only happens under Windows in Debug or when migrating
// copied file // copied file
oldInstallerFullPath = config->getInstallationDirectory() + "/" + QFileInfo(oldInstallerFullPath).fileName(); oldInstallerFullPath = config->getInstallationDirectory() + "/" + QFileInfo(oldInstallerFullPath).fileName();