From d3dc00dcab31ecf4a8ae5886db310ff0bedc9018 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 14 Jul 2023 21:07:53 +0300
Subject: [PATCH] made concurent task fail

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 .../modplatform/flame/FileResolvingTask.cpp   |  1 -
 launcher/tasks/ConcurrentTask.cpp             | 20 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index f84002385..7695dfcdf 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -112,7 +112,6 @@ void Flame::FileResolvingTask::netJobFinished()
     connect(m_checkJob.get(), &NetJob::failed, this, [this, step_progress](QString reason) {
         step_progress->state = TaskStepState::Failed;
         stepProgress(*step_progress);
-        emitFailed(reason);
     });
     connect(m_checkJob.get(), &NetJob::stepProgress, this, &FileResolvingTask::propogateStepProgress);
     connect(m_checkJob.get(), &NetJob::progress, this, [this, step_progress](qint64 current, qint64 total) {
diff --git a/launcher/tasks/ConcurrentTask.cpp b/launcher/tasks/ConcurrentTask.cpp
index 9aada5e69..7c7cfaf72 100644
--- a/launcher/tasks/ConcurrentTask.cpp
+++ b/launcher/tasks/ConcurrentTask.cpp
@@ -118,8 +118,11 @@ void ConcurrentTask::startNext()
     if (m_aborted || m_doing.count() > m_total_max_size)
         return;
 
-    if (m_queue.isEmpty() && m_doing.isEmpty() && !wasSuccessful()) {
-        emitSucceeded();
+    if (m_queue.isEmpty() && m_doing.isEmpty() && isRunning()) {
+        if (m_failed.isEmpty())
+            emitSucceeded();
+        else
+            emitFailed(tr("One or more subtasks failed"));
         return;
     }
 
@@ -194,7 +197,7 @@ void ConcurrentTask::subTaskStatus(Task::Ptr task, const QString& msg)
     auto task_progress = m_task_progress.value(task->getUid());
     task_progress->status = msg;
     task_progress->state = TaskStepState::Running;
-    
+
     emit stepProgress(*task_progress);
 
     if (totalSize() == 1) {
@@ -207,7 +210,7 @@ void ConcurrentTask::subTaskDetails(Task::Ptr task, const QString& msg)
     auto task_progress = m_task_progress.value(task->getUid());
     task_progress->details = msg;
     task_progress->state = TaskStepState::Running;
-    
+
     emit stepProgress(*task_progress);
 
     if (totalSize() == 1) {
@@ -220,7 +223,7 @@ void ConcurrentTask::subTaskProgress(Task::Ptr task, qint64 current, qint64 tota
     auto task_progress = m_task_progress.value(task->getUid());
 
     task_progress->update(current, total);
-        
+
     emit stepProgress(*task_progress);
     updateStepProgress(*task_progress, Operation::CHANGED);
     updateState();
@@ -233,7 +236,7 @@ void ConcurrentTask::subTaskProgress(Task::Ptr task, qint64 current, qint64 tota
 void ConcurrentTask::subTaskStepProgress(Task::Ptr task, TaskStepProgress const& task_progress)
 {
     Operation op = Operation::ADDED;
-    
+
     if (!m_task_progress.contains(task_progress.uid)) {
         m_task_progress.insert(task_progress.uid, std::make_shared<TaskStepProgress>(task_progress));
         op = Operation::ADDED;
@@ -254,12 +257,10 @@ void ConcurrentTask::subTaskStepProgress(Task::Ptr task, TaskStepProgress const&
         emit stepProgress(*tp.get());
         updateStepProgress(*tp.get(), op);
     }
-
 }
 
 void ConcurrentTask::updateStepProgress(TaskStepProgress const& changed_progress, Operation op)
 {
-
     switch (op) {
         case Operation::ADDED:
             m_stepProgress += changed_progress.current;
@@ -274,9 +275,8 @@ void ConcurrentTask::updateStepProgress(TaskStepProgress const& changed_progress
             m_stepTotalProgress -= changed_progress.old_total;
             m_stepProgress += changed_progress.current;
             m_stepTotalProgress += changed_progress.total;
-            break;    
+            break;
     }
-
 }
 
 void ConcurrentTask::updateState()