aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-08-04 10:02:54 +0200
committerSefa Eyeoglu <contact@scrumplex.net>2022-08-04 10:07:36 +0200
commit355762aa303361819340cc2f8b92ada326a7e03d (patch)
tree205ceb22302815ca251c70d5c469896bc1b28e3c
parent4ed296bad493f2cefbde275fea79a91a1849e886 (diff)
downloadPrismLauncher-355762aa303361819340cc2f8b92ada326a7e03d.tar.gz
PrismLauncher-355762aa303361819340cc2f8b92ada326a7e03d.tar.bz2
PrismLauncher-355762aa303361819340cc2f8b92ada326a7e03d.zip
fix: emit abort in LaunchController
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
-rw-r--r--launcher/Application.cpp3
-rw-r--r--launcher/LaunchController.cpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 2bd91fd7..c4bb84e4 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1258,6 +1258,9 @@ bool Application::launch(
}
connect(controller.get(), &LaunchController::succeeded, this, &Application::controllerSucceeded);
connect(controller.get(), &LaunchController::failed, this, &Application::controllerFailed);
+ connect(controller.get(), &LaunchController::aborted, this, [this] {
+ controllerFailed(tr("Aborted"));
+ });
addRunningInstance();
controller->start();
return true;
diff --git a/launcher/LaunchController.cpp b/launcher/LaunchController.cpp
index 38df1b04..11f9b2bb 100644
--- a/launcher/LaunchController.cpp
+++ b/launcher/LaunchController.cpp
@@ -160,6 +160,7 @@ void LaunchController::login() {
);
if (result == QMessageBox::No) {
+ emitAborted();
return;
}
}