forked from qt-creator/qt-creator
TaskTree: Define parentTask a bit earlier
Change-Id: I4cb68e073e7d56f8d739b4b1cb387594b7e6a9f2 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -2200,17 +2200,17 @@ void RuntimeContainer::deleteFinishedIterations()
|
|||||||
|
|
||||||
void TaskTreePrivate::continueContainer(RuntimeContainer *container)
|
void TaskTreePrivate::continueContainer(RuntimeContainer *container)
|
||||||
{
|
{
|
||||||
if (container->m_parentTask->m_setupResult == SetupResult::Continue)
|
RuntimeTask *parentTask = container->m_parentTask;
|
||||||
|
if (parentTask->m_setupResult == SetupResult::Continue)
|
||||||
startChildren(container);
|
startChildren(container);
|
||||||
if (container->m_parentTask->m_setupResult == SetupResult::Continue)
|
if (parentTask->m_setupResult == SetupResult::Continue)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const bool bit = container->updateSuccessBit(container->m_parentTask->m_setupResult == SetupResult::StopWithSuccess);
|
const bool bit = container->updateSuccessBit(parentTask->m_setupResult == SetupResult::StopWithSuccess);
|
||||||
RuntimeIteration *parentIteration = container->parentIteration();
|
RuntimeIteration *parentIteration = container->parentIteration();
|
||||||
RuntimeTask *parentTask = container->m_parentTask;
|
|
||||||
QT_CHECK(parentTask);
|
QT_CHECK(parentTask);
|
||||||
const bool result = invokeDoneHandler(container, bit ? DoneWith::Success : DoneWith::Error);
|
const bool result = invokeDoneHandler(container, bit ? DoneWith::Success : DoneWith::Error);
|
||||||
container->m_parentTask->m_setupResult = toSetupResult(result);
|
parentTask->m_setupResult = toSetupResult(result);
|
||||||
if (parentIteration) {
|
if (parentIteration) {
|
||||||
parentIteration->removeChild(parentTask);
|
parentIteration->removeChild(parentTask);
|
||||||
if (!parentIteration->m_container->isStarting())
|
if (!parentIteration->m_container->isStarting())
|
||||||
|
Reference in New Issue
Block a user