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

Changed: Abort if operation failed

Browse source
This commit is contained in:
kervala 2016-10-11 18:02:20 +02:00
parent 7c67e7e336
commit 56acc45412
1 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -558,12 +558,7 @@ void COperationDialog::extractDownloadedData()
extractor.setSourceFile(config->getInstallationDirectory() + "/" + server.dataDownloadFilename); extractor.setSourceFile(config->getInstallationDirectory() + "/" + server.dataDownloadFilename);
extractor.setDestinationDirectory(dest); extractor.setDestinationDirectory(dest);
if (extractor.exec()) if (!extractor.exec()) return;
{
}
else
{
}
emit done(); emit done();
} }
@ -593,12 +588,7 @@ void COperationDialog::extractDownloadedClient()
extractor.setSourceFile(config->getInstallationDirectory() + "/" + config->expandVariables(server.clientDownloadFilename)); extractor.setSourceFile(config->getInstallationDirectory() + "/" + config->expandVariables(server.clientDownloadFilename));
extractor.setDestinationDirectory(destinationDirectory); extractor.setDestinationDirectory(destinationDirectory);
if (extractor.exec()) if (!extractor.exec()) return;
{
}
else
{
}
launchUpgradeScript(destinationDirectory, server.clientFilename); launchUpgradeScript(destinationDirectory, server.clientFilename);
@ -626,12 +616,7 @@ void COperationDialog::copyDataFiles()
copier.setDestinationDirectory(server.getDirectory()); copier.setDestinationDirectory(server.getDirectory());
copier.setIncludeFilter(serverFiles); copier.setIncludeFilter(serverFiles);
if (copier.exec()) if (!copier.exec()) return;
{
}
else
{
}
emit done(); emit done();
} }
@ -661,12 +646,7 @@ void COperationDialog::copyProfileFiles()
copier.setDestinationDirectory(profile.getDirectory()); copier.setDestinationDirectory(profile.getDirectory());
copier.setIncludeFilter(profileFiles); copier.setIncludeFilter(profileFiles);
if (copier.exec()) if (!copier.exec()) return;
{
}
else
{
}
// correct path to client_default.cfg // correct path to client_default.cfg
profile.createClientConfig(); profile.createClientConfig();
@ -688,7 +668,8 @@ void COperationDialog::extractBnpClient()
CFilesExtractor extractor(this); CFilesExtractor extractor(this);
extractor.setSourceFile(config->getSrcServerClientBNPFullPath()); extractor.setSourceFile(config->getSrcServerClientBNPFullPath());
extractor.setDestinationDirectory(destinationDirectory); extractor.setDestinationDirectory(destinationDirectory);
extractor.exec();
if (!extractor.exec()) return;
launchUpgradeScript(destinationDirectory, server.clientFilename); launchUpgradeScript(destinationDirectory, server.clientFilename);