diff options
| author | timoreo22 <timo.oreo34@gmail.com> | 2022-05-28 15:38:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-28 15:38:36 +0200 |
| commit | 83078cd49a8fbe67c535397a990a33c84b845b5c (patch) | |
| tree | edf4c65e8d6b407725918bdf71b9b5ebd7f42acf /launcher/InstanceImportTask.cpp | |
| parent | 53e0d13142aae946e99f8328e069c27338ed031a (diff) | |
| parent | 48e20cb5f714fbee83889d55505eb99c3f444cda (diff) | |
| download | PrismLauncher-83078cd49a8fbe67c535397a990a33c84b845b5c.tar.gz PrismLauncher-83078cd49a8fbe67c535397a990a33c84b845b5c.tar.bz2 PrismLauncher-83078cd49a8fbe67c535397a990a33c84b845b5c.zip | |
Merge pull request #657 from JJL772/fix/misc-fixes
Fix crash when aborting instance import
Diffstat (limited to 'launcher/InstanceImportTask.cpp')
| -rw-r--r-- | launcher/InstanceImportTask.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp index 514cbcc5..4acde16d 100644 --- a/launcher/InstanceImportTask.cpp +++ b/launcher/InstanceImportTask.cpp @@ -72,7 +72,8 @@ InstanceImportTask::InstanceImportTask(const QUrl sourceUrl, QWidget* parent) bool InstanceImportTask::abort() { - m_filesNetJob->abort(); + if (m_filesNetJob) + m_filesNetJob->abort(); m_extractFuture.cancel(); return false; @@ -394,7 +395,7 @@ void InstanceImportTask::processFlame() { auto results = m_modIdResolver->getResults(); m_filesNetJob = new NetJob(tr("Mod download"), APPLICATION->network()); - for(auto result: results.files) + for(const auto& result: results.files) { QString filename = result.fileName; if(!result.required) |