diff options
| author | he3als <65787561+he3als@users.noreply.github.com> | 2022-10-22 15:30:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-22 15:30:40 +0100 |
| commit | 89fd84d916b58cb7c82c94bcadc0834de8f5a039 (patch) | |
| tree | fae8c646ca9b35bc2499a4c39787387686ae2a91 /launcher/modplatform/atlauncher | |
| parent | 92dfd659f1a3e11accdbf0ebbdc7cb91f74d9a21 (diff) | |
| parent | 81f13052701dbec499ef65fe714f107a9b584ebf (diff) | |
| download | PrismLauncher-89fd84d916b58cb7c82c94bcadc0834de8f5a039.tar.gz PrismLauncher-89fd84d916b58cb7c82c94bcadc0834de8f5a039.tar.bz2 PrismLauncher-89fd84d916b58cb7c82c94bcadc0834de8f5a039.zip | |
Merge branch 'PrismLauncher:develop' into develop
Diffstat (limited to 'launcher/modplatform/atlauncher')
| -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 |