From a6b13487f0e27c8bea1917720a0c5c1eb1eb206c Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Thu, 20 Oct 2022 18:30:32 +0100
Subject: ATLauncher: Abort install if optional mods dialog is closed

This matches the behaviour of ATLauncher.
---
 launcher/modplatform/atlauncher/ATLPackInstallTask.cpp | 7 ++++++-
 launcher/modplatform/atlauncher/ATLPackInstallTask.h   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'launcher/modplatform/atlauncher')

diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index a553eafd..68d75943 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -736,7 +736,12 @@ void PackInstallTask::downloadMods()
     QVector<QString> selectedMods;
     if (!optionalMods.isEmpty()) {
         setStatus(tr("Selecting optional mods..."));
-        selectedMods = m_support->chooseOptionalMods(m_version, optionalMods);
+        auto mods = m_support->chooseOptionalMods(m_version, optionalMods);
+        if (!mods.has_value()) {
+            emitAborted();
+            return;
+        }
+        selectedMods = mods.value();
     }
 
     setStatus(tr("Downloading mods..."));
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.h b/launcher/modplatform/atlauncher/ATLPackInstallTask.h
index ed4436f0..78cd87fb 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.h
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.h
@@ -62,7 +62,7 @@ public:
     /**
      * Requests a user interaction to select which optional mods should be installed.
      */
-    virtual QVector<QString> chooseOptionalMods(PackVersion version, QVector<ATLauncher::VersionMod> mods) = 0;
+    virtual std::optional<QVector<QString>> chooseOptionalMods(PackVersion version, QVector<ATLauncher::VersionMod> mods) = 0;
 
     /**
      * Requests a user interaction to select a component version from a given version list
-- 
cgit