forked from qt-creator/qt-creator
Valgrind: Fix process result
Don't emit signals when tasks were canceled. Change-Id: I5f209f5865571cd096ac09f21c83620019fdbadd Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -182,7 +182,8 @@ Group ValgrindProcessPrivate::runRecipe() const
|
||||
});
|
||||
connect(this, &ValgrindProcessPrivate::stopRequested, processPtr, &Process::stop);
|
||||
};
|
||||
const auto onProcessDone = [this, storage](const Process &process) {
|
||||
const auto onProcessDone = [this, storage](const Process &process, DoneWith result) {
|
||||
if (result == DoneWith::Error)
|
||||
emit q->processErrorReceived(process.errorString(), process.result());
|
||||
};
|
||||
|
||||
@@ -194,7 +195,8 @@ Group ValgrindProcessPrivate::runRecipe() const
|
||||
parser.setSocket(storage->m_xmlSocket.release());
|
||||
};
|
||||
|
||||
const auto onParserDone = [this](const Parser &parser) {
|
||||
const auto onParserDone = [this](const Parser &parser, DoneWith result) {
|
||||
if (result == DoneWith::Error)
|
||||
emit q->internalError(parser.errorString());
|
||||
};
|
||||
|
||||
@@ -203,10 +205,10 @@ Group ValgrindProcessPrivate::runRecipe() const
|
||||
xmlBarrier,
|
||||
If (isSetupValid) >> Then {
|
||||
parallel,
|
||||
ProcessTask(onProcessSetup, onProcessDone, CallDoneIf::Error),
|
||||
ProcessTask(onProcessSetup, onProcessDone),
|
||||
If (isAddressValid) >> Then {
|
||||
waitForBarrierTask(xmlBarrier),
|
||||
ParserTask(onParserSetup, onParserDone, CallDoneIf::Error)
|
||||
ParserTask(onParserSetup, onParserDone)
|
||||
}
|
||||
} >> Else {
|
||||
errorItem
|
||||
|
Reference in New Issue
Block a user