diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-10-22 15:31:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-22 15:31:53 +0200 |
| commit | 24e4db676a57d1713a95b2ddda8f7a0cb1c9dc6a (patch) | |
| tree | dfb008a6755f710f761efb0d22f0c86de107f3d5 /launcher/modplatform | |
| parent | 6e21a9829de0f05aae5a9afd572ada14120a02f0 (diff) | |
| parent | a4f4f2891c8127c86365b1f36cf2982e1cfafa2c (diff) | |
| download | PrismLauncher-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')
| -rw-r--r-- | launcher/modplatform/atlauncher/ATLPackInstallTask.cpp | 7 | ||||
| -rw-r--r-- | launcher/modplatform/atlauncher/ATLPackInstallTask.h | 2 |
2 files changed, 7 insertions, 2 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...")); 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 |