diff options
author | flow <flowlnlnln@gmail.com> | 2022-11-17 11:29:28 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-17 11:29:28 -0800 |
commit | b24c09665f92683e25621a6fa721c73f65554ac9 (patch) | |
tree | 945a8bdf5d02f76e5437576a904c93b5465658ac /launcher/modplatform | |
parent | fa96ebd38251b921cac52a85e37274653357021a (diff) | |
parent | 52d43f843bceb861c92f8989a27194436924e087 (diff) | |
download | PrismLauncher-b24c09665f92683e25621a6fa721c73f65554ac9.tar.gz PrismLauncher-b24c09665f92683e25621a6fa721c73f65554ac9.tar.bz2 PrismLauncher-b24c09665f92683e25621a6fa721c73f65554ac9.zip |
Merge pull request #439 from Ryex/better-blocked-mods
Diffstat (limited to 'launcher/modplatform')
-rw-r--r-- | launcher/modplatform/flame/FlameInstanceCreationTask.cpp | 7 | ||||
-rw-r--r-- | launcher/modplatform/modpacksch/FTBPackInstallTask.cpp | 11 |
2 files changed, 9 insertions, 9 deletions
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp index f0fbdc96..91554b58 100644 --- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp +++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp @@ -393,9 +393,10 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop) qWarning() << "Blocked mods found, displaying mod list"; auto message_dialog = new BlockedModsDialog(m_parent, tr("Blocked mods found"), - tr("The following mods were blocked on third party launchers.<br/>" - "You will need to manually download them and add them to the modpack"), - blocked_mods); + tr("The following files are not available for download in third party launchers.<br/>" + "You will need to manually download them and add them to the instance."), + blocked_mods); + message_dialog->setModal(true); if (message_dialog->exec()) { diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp index 40aee82b..4c7b7a4f 100644 --- a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp +++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp @@ -211,18 +211,17 @@ void PackInstallTask::onResolveModsSucceeded() qDebug() << "Blocked files found, displaying file list"; auto message_dialog = new BlockedModsDialog(m_parent, tr("Blocked files found"), - tr("The following files are not available for download in third party launchers.<br/>" - "You will need to manually download them and add them to the instance."), - m_blocked_mods); + tr("The following files are not available for download in third party launchers.<br/>" + "You will need to manually download them and add them to the instance."), + m_blocked_mods); if (message_dialog->exec() == QDialog::Accepted) { qDebug() << "Post dialog blocked mods list: " << m_blocked_mods; createInstance(); - } - else { + } else { abort(); } - + } else { createInstance(); } |