From cd06f69cc9a38c90cea978b5cdb43849c1671466 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 5 Apr 2022 18:10:59 +0200 Subject: [PATCH] UvscServerProviderRunner: Connect to QtcProcess::done() signal Instead of connecting to errorOccurred() and finished() signals. Change-Id: I3c90e6d6166f0abcaadc5140439208058fbc75cd Reviewed-by: hjk Reviewed-by: --- .../debugservers/uvsc/uvscserverprovider.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp index 75d0cc12442..4887549dab8 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp @@ -388,15 +388,11 @@ UvscServerProviderRunner::UvscServerProviderRunner(ProjectExplorer::RunControl * reportStarted(); }); connect(&m_process, &QtcProcess::finished, this, [this] { - appendMessage(m_process.exitMessage(), NormalMessageFormat); - reportStopped(); - }); - connect(&m_process, &QtcProcess::errorOccurred, this, [this] (QProcess::ProcessError error) { - if (error == QProcess::Timedout) - return; // No actual change on the process side. - const QString msg = userMessageForProcessError( - error, m_process.commandLine().executable()); - appendMessage(msg, Utils::NormalMessageFormat); + const QProcess::ProcessError error = m_process.error(); + const QString message = (error == QProcess::UnknownError) + ? m_process.exitMessage() + : userMessageForProcessError(error, m_process.commandLine().executable()); + appendMessage(message, Utils::NormalMessageFormat); reportStopped(); }); }