diff options
| author | Jeremy Lorelli <jeremy.lorelli.1337@gmail.com> | 2022-05-27 16:41:57 -0700 |
|---|---|---|
| committer | Jeremy Lorelli <jeremy.lorelli.1337@gmail.com> | 2022-05-27 16:41:57 -0700 |
| commit | 48e20cb5f714fbee83889d55505eb99c3f444cda (patch) | |
| tree | 85ba1a65711080bc5cc3c55d9bbe689ae982ace9 /launcher/InstanceImportTask.cpp | |
| parent | 3ff26d5cfe293c635655d35e96d093ef0b383dc2 (diff) | |
| download | PrismLauncher-48e20cb5f714fbee83889d55505eb99c3f444cda.tar.gz PrismLauncher-48e20cb5f714fbee83889d55505eb99c3f444cda.tar.bz2 PrismLauncher-48e20cb5f714fbee83889d55505eb99c3f444cda.zip | |
Fix crash when aborting instance import
Also turned a loop var into a reference to avoid copies on each iteration
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 4bad7251..56081ed1 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; @@ -386,7 +387,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) |