CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #657 from JJL772/fix/misc-fixes

Browse Source 
Fix crash when aborting instance import
This commit is contained in:
timoreo22 2022-05-28 15:38:36 +02:00 committed by GitHub
commit 83078cd49a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
launcher/InstanceImportTask.cpp
View File

@ -72,6 +72,7 @@ InstanceImportTask::InstanceImportTask(const QUrl sourceUrl, QWidget* parent)
bool InstanceImportTask::abort() bool InstanceImportTask::abort()
{ {
if (m_filesNetJob)
m_filesNetJob->abort(); m_filesNetJob->abort();
m_extractFuture.cancel(); m_extractFuture.cancel();
@ -394,7 +395,7 @@ void InstanceImportTask::processFlame()
{ {
auto results = m_modIdResolver->getResults(); auto results = m_modIdResolver->getResults();
m_filesNetJob = new NetJob(tr("Mod download"), APPLICATION->network()); m_filesNetJob = new NetJob(tr("Mod download"), APPLICATION->network());
for(auto result: results.files) for(const auto& result: results.files)
{ {
QString filename = result.fileName; QString filename = result.fileName;
if(!result.required) if(!result.required)