aboutsummaryrefslogtreecommitdiff
path: root/launcher/InstanceImportTask.cpp
diff options
context:
space:
mode:
authorflow <flowlnlnln@gmail.com>2022-06-23 07:58:27 -0300
committerflow <flowlnlnln@gmail.com>2022-07-03 12:43:04 -0300
commit4bfc445cf8f2a9b0e1d704e43f5a81f841159f79 (patch)
treee16f908db34de4e1e5ff6b9031843f3f938d02b7 /launcher/InstanceImportTask.cpp
parent4232b1cedbae070ef27bd56d3fb3fad165e9836e (diff)
downloadPrismLauncher-4bfc445cf8f2a9b0e1d704e43f5a81f841159f79.tar.gz
PrismLauncher-4bfc445cf8f2a9b0e1d704e43f5a81f841159f79.tar.bz2
PrismLauncher-4bfc445cf8f2a9b0e1d704e43f5a81f841159f79.zip
fix: add progress indicator on Flame mod resolution dialog
This code is super :pofat: omg Signed-off-by: flow <flowlnlnln@gmail.com>
Diffstat (limited to 'launcher/InstanceImportTask.cpp')
-rw-r--r--launcher/InstanceImportTask.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp
index d5684805..6b0f08d1 100644
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@@ -412,12 +412,8 @@ void InstanceImportTask::processFlame()
"You will need to manually download them and add them to the modpack"),
text);
message_dialog->setModal(true);
- message_dialog->show();
- connect(message_dialog, &QDialog::rejected, [&]() {
- m_modIdResolver.reset();
- emitFailed("Canceled");
- });
- connect(message_dialog, &QDialog::accepted, [&]() {
+
+ if (message_dialog->exec()) {
m_filesNetJob = new NetJob(tr("Mod download"), APPLICATION->network());
for (const auto &result: m_modIdResolver->getResults().files) {
QString filename = result.fileName;
@@ -469,8 +465,11 @@ void InstanceImportTask::processFlame()
});
setStatus(tr("Downloading mods..."));
m_filesNetJob->start();
- });
- }else{
+ } else {
+ m_modIdResolver.reset();
+ emitFailed("Canceled");
+ }
+ } else {
//TODO extract to function ?
m_filesNetJob = new NetJob(tr("Mod download"), APPLICATION->network());
for (const auto &result: m_modIdResolver->getResults().files) {