diff options
| author | Jamie Mansfield <jmansfield@cadixdev.org> | 2022-10-20 18:30:32 +0100 |
|---|---|---|
| committer | Jamie Mansfield <jmansfield@cadixdev.org> | 2022-10-22 12:35:34 +0100 |
| commit | a6b13487f0e27c8bea1917720a0c5c1eb1eb206c (patch) | |
| tree | f99d9397e31762d5d052db5c75eb45aa697aaf4f /launcher/ui/pages/modplatform/atlauncher | |
| parent | 54c26b05faa73dd6c8eb21f6fa898d438a3e867a (diff) | |
| download | PrismLauncher-a6b13487f0e27c8bea1917720a0c5c1eb1eb206c.tar.gz PrismLauncher-a6b13487f0e27c8bea1917720a0c5c1eb1eb206c.tar.bz2 PrismLauncher-a6b13487f0e27c8bea1917720a0c5c1eb1eb206c.zip | |
ATLauncher: Abort install if optional mods dialog is closed
This matches the behaviour of ATLauncher.
Diffstat (limited to 'launcher/ui/pages/modplatform/atlauncher')
| -rw-r--r-- | launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp | 7 | ||||
| -rw-r--r-- | launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp index 03196685..c68e40ba 100644 --- a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp +++ b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp @@ -43,10 +43,13 @@ AtlUserInteractionSupportImpl::AtlUserInteractionSupportImpl(QWidget *parent) : { } -QVector<QString> AtlUserInteractionSupportImpl::chooseOptionalMods(ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods) +std::optional<QVector<QString>> AtlUserInteractionSupportImpl::chooseOptionalMods(ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods) { AtlOptionalModDialog optionalModDialog(m_parent, version, mods); - optionalModDialog.exec(); + auto result = optionalModDialog.exec(); + if (result == QDialog::Rejected) { + return {}; + } return optionalModDialog.getResult(); } diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h index aa22fc73..3b37c9be 100644 --- a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h +++ b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h @@ -47,7 +47,7 @@ public: private: QString chooseVersion(Meta::VersionListPtr vlist, QString minecraftVersion) override; - QVector<QString> chooseOptionalMods(ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods) override; + std::optional<QVector<QString>> chooseOptionalMods(ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods) override; void displayMessage(QString message) override; private: |