mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-17 13:01:42 +00:00
Fixed: Don't forget to expand variables un client names
This commit is contained in:
parent
e5ba01fd41
commit
ddcbd3ff21
2 changed files with 4 additions and 4 deletions
|
@ -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))
|
||||
|
|
|
@ -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())
|
||||
|
|
Loading…
Reference in a new issue