aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-10-22 15:31:53 +0200
committerGitHub <noreply@github.com>2022-10-22 15:31:53 +0200
commit24e4db676a57d1713a95b2ddda8f7a0cb1c9dc6a (patch)
treedfb008a6755f710f761efb0d22f0c86de107f3d5 /launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
parent6e21a9829de0f05aae5a9afd572ada14120a02f0 (diff)
parenta4f4f2891c8127c86365b1f36cf2982e1cfafa2c (diff)
downloadPrismLauncher-24e4db676a57d1713a95b2ddda8f7a0cb1c9dc6a.tar.gz
PrismLauncher-24e4db676a57d1713a95b2ddda8f7a0cb1c9dc6a.tar.bz2
PrismLauncher-24e4db676a57d1713a95b2ddda8f7a0cb1c9dc6a.zip
Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog
Diffstat (limited to 'launcher/modplatform/atlauncher/ATLPackInstallTask.cpp')
-rw-r--r--launcher/modplatform/atlauncher/ATLPackInstallTask.cpp7
1 files changed, 6 insertions, 1 deletions
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..."));