mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-08-15 12:52:59 +03:00
commit 42a6c670c7
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
219 changed files with 3289 additions and 1840 deletions
Download patch file Download diff file Expand all files Collapse all files

4
launcher/tasks/ConcurrentTask.cpp
View file

@ -88,7 +88,7 @@ bool ConcurrentTask::abort()
QMutableHashIterator<Task*, Task::Ptr> doing_iter(m_doing);
while (doing_iter.hasNext()) {
auto task = doing_iter.next();
disconnect(task.value().get(), &Task::aborted, this, 0);
disconnect(task->get(), &Task::aborted, this, 0);
suceedeed &= (task.value())->abort();
}
@ -177,7 +177,7 @@ void ConcurrentTask::subTaskSucceeded(Task::Ptr task)
startNext();
}
void ConcurrentTask::subTaskFailed(Task::Ptr task, const QString& msg)
void ConcurrentTask::subTaskFailed(Task::Ptr task, [[maybe_unused]] const QString& msg)
{
m_done.insert(task.get(), task);
m_failed.insert(task.get(), task);