Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user