aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-10-22 12:44:20 +0200
committerGitHub <noreply@github.com>2022-10-22 12:44:20 +0200
commit54c26b05faa73dd6c8eb21f6fa898d438a3e867a (patch)
tree861a6f6e51cb0b6f2d575eb2b0d6f7616298e64b /launcher
parentbd376d5217905ac4dcfd7700c8eba2989b03fa7e (diff)
parent01b90809e8be2bef02644ba91feceb21b6f7cb8f (diff)
downloadPrismLauncher-54c26b05faa73dd6c8eb21f6fa898d438a3e867a.tar.gz
PrismLauncher-54c26b05faa73dd6c8eb21f6fa898d438a3e867a.tar.bz2
PrismLauncher-54c26b05faa73dd6c8eb21f6fa898d438a3e867a.zip
Merge pull request #185 from flowln/fix_blocked_mods_crash
Diffstat (limited to 'launcher')
-rw-r--r--launcher/modplatform/flame/FileResolvingTask.cpp6
-rw-r--r--launcher/ui/dialogs/ProgressDialog.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index 1e7f5559..0b2431f7 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -66,7 +66,11 @@ void Flame::FileResolvingTask::netJobFinished()
}
index++;
}
- connect(job, &NetJob::finished, this, &Flame::FileResolvingTask::modrinthCheckFinished);
+ connect(job, &NetJob::finished, this,
+ [this, &job] {
+ modrinthCheckFinished();
+ job->deleteLater();
+ });
job->start();
}
diff --git a/launcher/ui/dialogs/ProgressDialog.cpp b/launcher/ui/dialogs/ProgressDialog.cpp
index 68dd4d17..05269f62 100644
--- a/launcher/ui/dialogs/ProgressDialog.cpp
+++ b/launcher/ui/dialogs/ProgressDialog.cpp
@@ -136,11 +136,13 @@ void ProgressDialog::onTaskStarted() {}
void ProgressDialog::onTaskFailed(QString failure)
{
reject();
+ hide();
}
void ProgressDialog::onTaskSucceeded()
{
accept();
+ hide();
}
void ProgressDialog::changeStatus(const QString& status)