From 24036021bbd3833b8dfc66a8a3162a087ea16b37 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Tue, 29 Apr 2025 16:46:11 +0100
Subject: [PATCH] Propagate task warnings

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/InstanceImportTask.cpp | 5 +++++
 launcher/tasks/Task.cpp         | 2 ++
 launcher/tasks/Task.h           | 1 +
 3 files changed, 8 insertions(+)

diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp
index 633382404..b5a41b590 100644
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@@ -212,6 +212,7 @@ void InstanceImportTask::processZipPack()
         progressStep->status = status;
         stepProgress(*progressStep);
     });
+    connect(zipTask.get(), &Task::warningLogged, this, [this](const QString& line) { m_Warnings.append(line); });
     m_task.reset(zipTask);
     zipTask->start();
 }
@@ -308,6 +309,8 @@ void InstanceImportTask::processFlame()
     connect(inst_creation_task.get(), &Task::aborted, this, &Task::abort);
     connect(inst_creation_task.get(), &Task::abortStatusChanged, this, &Task::setAbortable);
 
+    connect(inst_creation_task.get(), &Task::warningLogged, this, [this](const QString& line) { m_Warnings.append(line); });
+
     m_task.reset(inst_creation_task);
     setAbortable(true);
     m_task->start();
@@ -407,6 +410,8 @@ void InstanceImportTask::processModrinth()
     connect(inst_creation_task.get(), &Task::aborted, this, &Task::abort);
     connect(inst_creation_task.get(), &Task::abortStatusChanged, this, &Task::setAbortable);
 
+    connect(inst_creation_task.get(), &Task::warningLogged, this, [this](const QString& line) { m_Warnings.append(line); });
+
     m_task.reset(inst_creation_task);
     setAbortable(true);
     m_task->start();
diff --git a/launcher/tasks/Task.cpp b/launcher/tasks/Task.cpp
index 1871c5df8..92b345c8d 100644
--- a/launcher/tasks/Task.cpp
+++ b/launcher/tasks/Task.cpp
@@ -196,6 +196,8 @@ void Task::logWarning(const QString& line)
 {
     qWarning() << line;
     m_Warnings.append(line);
+
+    emit warningLogged(line);
 }
 
 QStringList Task::warnings() const
diff --git a/launcher/tasks/Task.h b/launcher/tasks/Task.h
index fcd075150..43e71c8ab 100644
--- a/launcher/tasks/Task.h
+++ b/launcher/tasks/Task.h
@@ -145,6 +145,7 @@ class Task : public QObject, public QRunnable {
     void failed(QString reason);
     void status(QString status);
     void details(QString details);
+    void warningLogged(const QString& warning);
     void stepProgress(TaskStepProgress const& task_progress);
 
     //! Emitted when the canAbort() status has changed. */