From 33e1dedbf144cabc6c25820058b653170f6eeec5 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 19 Oct 2016 09:52:38 +0200 Subject: [PATCH] Merge with develop --- .../ryzom_installer/src/operationdialog.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index 702b445fe..9c7ebabf8 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -725,23 +725,18 @@ void COperationDialog::copyInstaller() 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(); if (!newInstallerFullPath.isEmpty()) { - QString srcDir = config->getSrcServerDirectory(); - - if (srcDir.isEmpty()) srcDir = config->getInstallerCurrentDirPath(); + QString destinationDirectory = config->getInstallationDirectory(); + QString oldInstallerFullPath = config->getInstallerCurrentFilePath(); + QString srcDir = config->getInstallerCurrentDirPath(); // always copy new installers CFilesCopier copier(this); copier.setIncludeFilter(config->getInstallerRequiredFiles()); -#ifdef Q_OS_WIN32 +#ifndef Q_OS_MAC copier.addFile(oldInstallerFullPath); #endif copier.setSourceDirectory(srcDir); @@ -749,9 +744,7 @@ void COperationDialog::copyInstaller() if (!copier.exec()) return; -#ifdef Q_OS_WIN32 - // only happens under Windows in Debug or when migrating - +#ifndef Q_OS_MAC // copied file oldInstallerFullPath = config->getInstallationDirectory() + "/" + QFileInfo(oldInstallerFullPath).fileName();