From f0e83f7dd358975990d0cadbf75fae91460de13d Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 29 May 2016 20:35:34 +0200 Subject: [PATCH] Changed: Return 1 if user aborted operation --- .../tools/client/ryzom_installer/src/main.cpp | 44 +++++++------------ 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/main.cpp b/code/ryzom/tools/client/ryzom_installer/src/main.cpp index 31f247a8f..ea4b87918 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/main.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/main.cpp @@ -22,9 +22,6 @@ #include "uninstallwizarddialog.h" #include "operationdialog.h" -#include "nel/misc/path.h" -#include "nel/misc/ucstring.h" - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -59,8 +56,6 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); - // TODO: parameters -u (uinstall) and -s (silent) - QApplication::setApplicationName("Ryzom"); QApplication::setApplicationVersion(RYZOM_VERSION); QApplication::setWindowIcon(QIcon(":/icons/ryzom.ico")); @@ -152,40 +147,31 @@ int main(int argc, char *argv[]) { CMigrateWizardDialog dialog; - if (!dialog.exec()) displayMainWindow = false; + if (!dialog.exec()) return 1; + + step = config.getNextStep(); } else if (step == CConfigFile::ShowInstallWizard) { CInstallWizardDialog dialog; - if (!dialog.exec()) displayMainWindow = false; - } + if (!dialog.exec()) return 1; - - if (displayMainWindow) - { step = config.getNextStep(); - - if (step != CConfigFile::Done) - { - COperationDialog dialog; - - if (!dialog.exec()) displayMainWindow = false; - } } - - if (displayMainWindow) + + if (step != CConfigFile::Done) { + COperationDialog dialog; + dialog.setOperation(config.getSrcServerDirectory().isEmpty() ? COperationDialog::OperationInstall: COperationDialog::OperationMigrate); + + if (!dialog.exec()) return 1; + step = config.getNextStep(); - - if (step == CConfigFile::Done) - { - CMainWindow mainWindow; - mainWindow.show(); - - return QApplication::exec(); - } } - return 0; + CMainWindow mainWindow; + mainWindow.show(); + + return QApplication::exec(); }