aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@gmx.de>2020-12-09 14:07:07 +0100
committerOswald Buddenhagen <oswald.buddenhagen@gmx.de>2020-12-11 14:54:07 +0000
commit3201d9162495ae78e4d96a5946e30b3569f400cc (patch)
tree788a280bd5e6f35b0b542a3c6cdddb0b1fd43781
parent891c797c4b1a2fa98bf0bc7ab95d72ad9cf92350 (diff)
process synchrounus process output in every case
there is no logical difference between a hung or crashed process and one that exited non-zero. blocking execution already behaved that way. Change-Id: Ifb80d050f9771cb9ea4021329ffef8e646e43ac9 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
-rw-r--r--src/libs/utils/synchronousprocess.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp
index e4fb015070..0845e4b803 100644
--- a/src/libs/utils/synchronousprocess.cpp
+++ b/src/libs/utils/synchronousprocess.cpp
@@ -495,10 +495,8 @@ SynchronousProcessResponse SynchronousProcess::run(const CommandLine &cmd,
if (isGuiThread())
QApplication::setOverrideCursor(Qt::WaitCursor);
d->m_eventLoop.exec(QEventLoop::ExcludeUserInputEvents);
- if (d->m_result.result == SynchronousProcessResponse::Finished || d->m_result.result == SynchronousProcessResponse::FinishedError) {
- processStdOut(false);
- processStdErr(false);
- }
+ processStdOut(false);
+ processStdErr(false);
d->m_result.rawStdOut = d->m_stdOut.rawData;
d->m_result.rawStdErr = d->m_stdErr.rawData;