feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Valgrind: Fix process result

Browse Source 
Don't emit signals when tasks were canceled.

Change-Id: I5f209f5865571cd096ac09f21c83620019fdbadd
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-06-13 13:02:08 +02:00
parent c546e16234
commit 1359e6ba61
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/valgrind/valgrindprocess.cpp
View File

@@ -182,8 +182,9 @@ Group ValgrindProcessPrivate::runRecipe() const
});
connect(this, &ValgrindProcessPrivate::stopRequested, processPtr, &Process::stop);
};
const auto onProcessDone = [this, storage](const Process &process) {
emit q->processErrorReceived(process.errorString(), process.result());
const auto onProcessDone = [this, storage](const Process &process, DoneWith result) {
if (result == DoneWith::Error)
emit q->processErrorReceived(process.errorString(), process.result());
};
const auto isAddressValid = [this] { return !m_localServerAddress.isNull(); };
@@ -194,8 +195,9 @@ Group ValgrindProcessPrivate::runRecipe() const
parser.setSocket(storage->m_xmlSocket.release());
};
const auto onParserDone = [this](const Parser &parser) {
emit q->internalError(parser.errorString());
const auto onParserDone = [this](const Parser &parser, DoneWith result) {
if (result == DoneWith::Error)
emit q->internalError(parser.errorString());
};
const Group root {
@@ -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