From effb69205065c1b43e84829f959d66e7f3f7c0d6 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 18 Jun 2016 19:50:26 +0200 Subject: [PATCH] Fixed: Don't forget to expand variables un client names --- code/ryzom/tools/client/ryzom_installer/src/configfile.cpp | 4 ++-- .../tools/client/ryzom_installer/src/operationdialog.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp index 4cb77cfff..99715da9e 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -704,7 +704,7 @@ OperationStep CConfigFile::getInstallNextStep() const // downloaded files are kept in server directory QString dataFile = getInstallationDirectory() + "/" + server.dataDownloadFilename; - QString clientFile = getInstallationDirectory() + "/" + server.clientDownloadFilename; + QString clientFile = getInstallationDirectory() + "/" + expandVariables(server.clientDownloadFilename); // data are not copied if (!areRyzomDataInstalledIn(serverDirectory)) @@ -760,7 +760,7 @@ OperationStep CConfigFile::getInstallNextStep() const return ExtractBnpClient; } - QString clientFile = getInstallationDirectory() + "/" + server.clientDownloadFilename; + QString clientFile = getInstallationDirectory() + "/" + expandVariables(server.clientDownloadFilename); // when file is not finished, it has .part extension if (!QFile::exists(clientFile)) diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index 667dad6f4..9870bedcf 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -278,7 +278,7 @@ void COperationDialog::processUpdateProfilesNextStep() } else { - QString clientFile = config->getInstallationDirectory() + "/" + server.clientDownloadFilename; + QString clientFile = config->getInstallationDirectory() + "/" + config->expandVariables(server.clientDownloadFilename); } } } @@ -452,7 +452,7 @@ void COperationDialog::extractDownloadedClient() m_currentOperationProgressFormat = QApplication::tr("Extracting %1..."); CFilesExtractor extractor(this); - extractor.setSourceFile(config->getInstallationDirectory() + "/" + server.clientDownloadFilename); + extractor.setSourceFile(config->getInstallationDirectory() + "/" + config->expandVariables(server.clientDownloadFilename)); extractor.setDestinationDirectory(server.getDirectory()); if (extractor.exec())