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/net/Download.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'launcher/net/Download.cpp')

diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp
index 3d6ca338..9c01fa8d 100644
--- a/launcher/net/Download.cpp
+++ b/launcher/net/Download.cpp
@@ -69,6 +69,8 @@ void Download::addValidator(Validator* v)
 
 void Download::executeTask()
 {
+    setStatus(tr("Downloading %1").arg(m_url.toString()));
+
     if (getState() == Task::State::AbortedByUser) {
         qWarning() << "Attempt to start an aborted Download:" << m_url.toString();
         emitAborted();
@@ -90,6 +92,7 @@ void Download::executeTask()
             emitFailed();
             return;
         case State::AbortedByUser:
+            emitAborted();
             return;
     }
 
@@ -216,13 +219,13 @@ void Download::downloadFinished()
         qDebug() << "Download failed in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emitFailed();
+        emit failed("");
         return;
     } else if (m_state == State::AbortedByUser) {
         qDebug() << "Download aborted in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emitAborted();
+        emit aborted();
         return;
     }
 
@@ -239,7 +242,7 @@ void Download::downloadFinished()
         qDebug() << "Download failed to finalize:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
-        emitFailed();
+        emit failed("");
         return;
     }
 
-- 
cgit