From 65fb83089e3c50ca0e59524b700703e676560eca Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 9 Dec 2020 18:52:45 +0100 Subject: [PATCH] fix waiting in SynchronousProcess::runBlocking() the conditions on the waitForFinished() calls were inverted. the visible effect of this was that 'Hang' was never reported. Change-Id: I9937fce58189eebf891000840597158b4bffd028 Reviewed-by: Orgad Shaneh --- src/libs/utils/synchronousprocess.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp index f7629238e79..9f52033e437 100644 --- a/src/libs/utils/synchronousprocess.cpp +++ b/src/libs/utils/synchronousprocess.cpp @@ -537,11 +537,11 @@ SynchronousProcessResponse SynchronousProcess::runBlocking(const CommandLine &cm return d->m_result; } d->m_process.closeWriteChannel(); - if (d->m_process.waitForFinished(d->m_maxHangTimerCount * 1000)) { + if (!d->m_process.waitForFinished(d->m_maxHangTimerCount * 1000)) { if (d->m_process.state() == QProcess::Running) { d->m_result.result = SynchronousProcessResponse::Hang; d->m_process.terminate(); - if (d->m_process.waitForFinished(1000) && d->m_process.state() == QProcess::Running) { + if (!d->m_process.waitForFinished(1000) && d->m_process.state() == QProcess::Running) { d->m_process.kill(); d->m_process.waitForFinished(1000); }