From 78b1407adf6ef09dc59ce597e69cae709d99f922 Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Thu, 2 Mar 2023 11:15:51 +0100 Subject: [PATCH] Docker: Don't swallow output when startup fails Previously error output occurring while the PID marker was not parsed yet was not passed on to the parent QtcProcess. Change-Id: Id6cbaa13a7d6c62d7a8612e118092eb2be6e790c Reviewed-by: hjk --- src/plugins/docker/dockerdevice.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index 97a4dba0da8..45e024b400b 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -238,8 +238,8 @@ DockerProcessImpl::DockerProcessImpl(IDevice::ConstPtr device, DockerDevicePriva }); connect(&m_process, &QtcProcess::readyReadStandardOutput, this, [this] { + QByteArray output = m_process.readAllRawStandardOutput(); if (!m_hasReceivedFirstOutput) { - QByteArray output = m_process.readAllRawStandardOutput(); qsizetype idx = output.indexOf('\n'); QByteArray firstLine = output.left(idx).trimmed(); QByteArray rest = output.mid(idx + 1); @@ -259,7 +259,7 @@ DockerProcessImpl::DockerProcessImpl(IDevice::ConstPtr device, DockerDevicePriva return; } } - emit readyRead(m_process.readAllRawStandardOutput(), {}); + emit readyRead(output, {}); }); connect(&m_process, &QtcProcess::readyReadStandardError, this, [this] {