Merge pull request #1516 from Trial97/abort_connect
This commit is contained in:
commit
f533173b95
@ -88,6 +88,7 @@ bool ConcurrentTask::abort()
|
||||
QMutableHashIterator<Task*, Task::Ptr> doing_iter(m_doing);
|
||||
while (doing_iter.hasNext()) {
|
||||
auto task = doing_iter.next();
|
||||
disconnect(task->get(), &Task::aborted, this, 0);
|
||||
suceedeed &= (task.value())->abort();
|
||||
}
|
||||
|
||||
@ -130,6 +131,7 @@ void ConcurrentTask::startNext()
|
||||
|
||||
connect(next.get(), &Task::succeeded, this, [this, next]() { subTaskSucceeded(next); });
|
||||
connect(next.get(), &Task::failed, this, [this, next](QString msg) { subTaskFailed(next, msg); });
|
||||
connect(next.get(), &Task::aborted, this, [this, next] { subTaskFailed(next, "Aborted"); });
|
||||
|
||||
connect(next.get(), &Task::status, this, [this, next](QString msg) { subTaskStatus(next, msg); });
|
||||
connect(next.get(), &Task::details, this, [this, next](QString msg) { subTaskDetails(next, msg); });
|
||||
|
Loading…
Reference in New Issue
Block a user