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

Fixed: Don't forget to expand variables un client names

Browse source
This commit is contained in:
kervala 2016-06-18 19:50:26 +02:00
parent e5ba01fd41
commit ddcbd3ff21
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

@ -704,7 +704,7 @@ OperationStep CConfigFile::getInstallNextStep() const
// downloaded files are kept in server directory // downloaded files are kept in server directory
QString dataFile = getInstallationDirectory() + "/" + server.dataDownloadFilename; QString dataFile = getInstallationDirectory() + "/" + server.dataDownloadFilename;
QString clientFile = getInstallationDirectory() + "/" + server.clientDownloadFilename; QString clientFile = getInstallationDirectory() + "/" + expandVariables(server.clientDownloadFilename);
// data are not copied // data are not copied
if (!areRyzomDataInstalledIn(serverDirectory)) if (!areRyzomDataInstalledIn(serverDirectory))
@ -760,7 +760,7 @@ OperationStep CConfigFile::getInstallNextStep() const
return ExtractBnpClient; return ExtractBnpClient;
} }
QString clientFile = getInstallationDirectory() + "/" + server.clientDownloadFilename; QString clientFile = getInstallationDirectory() + "/" + expandVariables(server.clientDownloadFilename);
// when file is not finished, it has .part extension // when file is not finished, it has .part extension
if (!QFile::exists(clientFile)) if (!QFile::exists(clientFile))

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

@ -278,7 +278,7 @@ void COperationDialog::processUpdateProfilesNextStep()
} }
else 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..."); m_currentOperationProgressFormat = QApplication::tr("Extracting %1...");
CFilesExtractor extractor(this); CFilesExtractor extractor(this);
extractor.setSourceFile(config->getInstallationDirectory() + "/" + server.clientDownloadFilename); extractor.setSourceFile(config->getInstallationDirectory() + "/" + config->expandVariables(server.clientDownloadFilename));
extractor.setDestinationDirectory(server.getDirectory()); extractor.setDestinationDirectory(server.getDirectory());
if (extractor.exec()) if (extractor.exec())