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

Changed: Return 1 if user aborted operation

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-05-29 20:35:34 +02:00
parent 2a4ae9ba6c
commit 86e143191c
1 changed files with 15 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
code/ryzom/tools/client/ryzom_installer/src/main.cpp
View file

@ -22,9 +22,6 @@
#include "uninstallwizarddialog.h" #include "uninstallwizarddialog.h"
#include "operationdialog.h" #include "operationdialog.h"
#include "nel/misc/path.h"
#include "nel/misc/ucstring.h"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
@ -59,8 +56,6 @@ int main(int argc, char *argv[])
QApplication app(argc, argv); QApplication app(argc, argv);
// TODO: parameters -u (uinstall) and -s (silent)
QApplication::setApplicationName("Ryzom"); QApplication::setApplicationName("Ryzom");
QApplication::setApplicationVersion(RYZOM_VERSION); QApplication::setApplicationVersion(RYZOM_VERSION);
QApplication::setWindowIcon(QIcon(":/icons/ryzom.ico")); QApplication::setWindowIcon(QIcon(":/icons/ryzom.ico"));
@ -152,40 +147,31 @@ int main(int argc, char *argv[])
{ {
CMigrateWizardDialog dialog; CMigrateWizardDialog dialog;
if (!dialog.exec()) displayMainWindow = false; if (!dialog.exec()) return 1;
step = config.getNextStep();
} }
else if (step == CConfigFile::ShowInstallWizard) else if (step == CConfigFile::ShowInstallWizard)
{ {
CInstallWizardDialog dialog; CInstallWizardDialog dialog;
if (!dialog.exec()) displayMainWindow = false; if (!dialog.exec()) return 1;
}
if (displayMainWindow)
{
step = config.getNextStep(); step = config.getNextStep();
}
if (step != CConfigFile::Done) if (step != CConfigFile::Done)
{ {
COperationDialog dialog; COperationDialog dialog;
dialog.setOperation(config.getSrcServerDirectory().isEmpty() ? COperationDialog::OperationInstall: COperationDialog::OperationMigrate);
if (!dialog.exec()) displayMainWindow = false; if (!dialog.exec()) return 1;
}
}
if (displayMainWindow)
{
step = config.getNextStep(); step = config.getNextStep();
}
if (step == CConfigFile::Done)
{
CMainWindow mainWindow; CMainWindow mainWindow;
mainWindow.show(); mainWindow.show();
return QApplication::exec(); return QApplication::exec();
}
}
return 0;
} }