From 57d65177c8ebb5463c88dd8e26f1e0a33f648bed Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Sun, 1 May 2022 11:05:31 -0300
Subject: fix: abort and fail logic in tasks

Also sets up correctly the status connections
---
 launcher/tasks/Task.cpp | 1 +
 launcher/tasks/Task.h   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'launcher/tasks')

diff --git a/launcher/tasks/Task.cpp b/launcher/tasks/Task.cpp
index 68e0e8a7..d2d62c9e 100644
--- a/launcher/tasks/Task.cpp
+++ b/launcher/tasks/Task.cpp
@@ -100,6 +100,7 @@ void Task::emitAborted()
     m_failReason = "Aborted.";
     qDebug() << "Task" << describe() << "aborted.";
     emit aborted();
+    emit finished();
 }
 
 void Task::emitSucceeded()
diff --git a/launcher/tasks/Task.h b/launcher/tasks/Task.h
index e09c57ae..0ca37e02 100644
--- a/launcher/tasks/Task.h
+++ b/launcher/tasks/Task.h
@@ -79,7 +79,7 @@ class Task : public QObject {
 
    public slots:
     virtual void start();
-    virtual bool abort() { return false; };
+    virtual bool abort() { if(canAbort()) emitAborted(); return canAbort(); };
 
    protected:
     virtual void executeTask() = 0;
-- 
cgit