dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into recommended-memory

Browse source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2025-04-30 10:35:17 +01:00 • committed by GitHub
commit 29d867cb88
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 1244 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

6
launcher/modplatform/flame/FlamePackExportTask.cpp
View file

@ -47,7 +47,7 @@ FlamePackExportTask::FlamePackExportTask(const QString& name,
bool optionalFiles,
InstancePtr instance,
const QString& output,
MMCZip::FilterFunction filter,
MMCZip::FilterFileFunction filter,
int recommendedRAM)
: name(name)
, version(version)
@ -72,7 +72,6 @@ bool FlamePackExportTask::abort()
{
if (task) {
task->abort();
emitAborted();
return true;
}
return false;
@ -173,6 +172,7 @@ void FlamePackExportTask::collectHashes()
progressStep->status = status;
stepProgress(*progressStep);
});
connect(hashingTask.get(), &Task::aborted, this, &FlamePackExportTask::emitAborted);
hashingTask->start();
}
@ -248,6 +248,7 @@ void FlamePackExportTask::makeApiRequest()
getProjectsInfo();
});
connect(task.get(), &Task::failed, this, &FlamePackExportTask::getProjectsInfo);
connect(task.get(), &Task::aborted, this, &FlamePackExportTask::emitAborted);
task->start();
}
@ -326,6 +327,7 @@ void FlamePackExportTask::getProjectsInfo()
buildZip();
});
connect(projTask.get(), &Task::failed, this, &FlamePackExportTask::emitFailed);
connect(task.get(), &Task::aborted, this, &FlamePackExportTask::emitAborted);
task.reset(projTask);
task->start();
}