diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-11-04 18:30:42 +0100 |
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-11-04 18:30:42 +0100 |
| commit | 21a7af535c8b5b9d231aa3c41f7a990689fde560 (patch) | |
| tree | af106527454f91335ec02b17bd36746bf2c3af60 /launcher/modplatform/atlauncher/ATLPackInstallTask.cpp | |
| parent | a241d3f187f07cd3049c0d17f711c674fd6e7ccd (diff) | |
| parent | 8f045af8679e9ae1da120eb56e4cec452284ac56 (diff) | |
| download | PrismLauncher-21a7af535c8b5b9d231aa3c41f7a990689fde560.tar.gz PrismLauncher-21a7af535c8b5b9d231aa3c41f7a990689fde560.tar.bz2 PrismLauncher-21a7af535c8b5b9d231aa3c41f7a990689fde560.zip | |
Merge branch 'develop' into macos-drag-n-drop
Diffstat (limited to 'launcher/modplatform/atlauncher/ATLPackInstallTask.cpp')
| -rw-r--r-- | launcher/modplatform/atlauncher/ATLPackInstallTask.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp index a553eafd..291ad916 100644 --- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp +++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp @@ -58,7 +58,7 @@ namespace ATLauncher { -static Meta::VersionPtr getComponentVersion(const QString& uid, const QString& version); +static Meta::Version::Ptr getComponentVersion(const QString& uid, const QString& version); PackInstallTask::PackInstallTask(UserInteractionSupport *support, QString packName, QString version, InstallMode installMode) { @@ -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...")); @@ -1032,7 +1037,7 @@ void PackInstallTask::install() emitSucceeded(); } -static Meta::VersionPtr getComponentVersion(const QString& uid, const QString& version) +static Meta::Version::Ptr getComponentVersion(const QString& uid, const QString& version) { auto vlist = APPLICATION->metadataIndex()->get(uid); if (!vlist) |