From b6722dba2467bfda3ffe0a597867c94d7e975546 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 19 Jun 2016 21:05:14 +0200 Subject: [PATCH] Fixed: Close dialog when clicking on Abort --HG-- branch : develop --- .../tools/client/ryzom_installer/src/operationdialog.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index 405973724..8252ffc63 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -90,6 +90,12 @@ void COperationDialog::setUninstallComponents(const SComponents &components) void COperationDialog::processNextStep() { + if (operationShouldStop()) + { + reject(); + return; + } + switch (m_operation) { case OperationMigrate: @@ -473,7 +479,7 @@ void COperationDialog::onProgressFail(const QString &error) void COperationDialog::onDone() { - if (!operationShouldStop()) processNextStep(); + processNextStep(); } void COperationDialog::downloadData()