From ef6020ae0f9bd420cc99386a5163c2334edca7af Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 25 Oct 2022 11:49:47 +0200 Subject: [PATCH] QtcProcess: Set Starting state a bit later To avoid resetting it back again to NotRunning in case an assert triggered. Change-Id: I4ba52bb64fd3b782013cf47d9149bef7f8a231af Reviewed-by: Qt CI Bot Reviewed-by: hjk --- src/libs/utils/qtcprocess.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 96a8ce72e57..96785bf2781 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -1095,16 +1095,16 @@ void QtcProcess::start() qWarning("Restarting the QtcProcess directly from one of its signal handlers will " "lead to crash! Consider calling close() prior to direct restart.")); d->clearForRun(); - d->m_state = QProcess::Starting; ProcessInterface *processImpl = nullptr; if (d->m_setup.m_commandLine.executable().needsDevice()) { - QTC_ASSERT(s_deviceHooks.processImplHook, d->m_state = QProcess::NotRunning; return); + QTC_ASSERT(s_deviceHooks.processImplHook, return); processImpl = s_deviceHooks.processImplHook(commandLine().executable()); } else { processImpl = d->createProcessInterface(); } - QTC_ASSERT(processImpl, d->m_state = QProcess::NotRunning; return); + QTC_ASSERT(processImpl, return); d->setProcessInterface(processImpl); + d->m_state = QProcess::Starting; d->m_process->m_setup = d->m_setup; d->m_process->m_setup.m_commandLine = d->fullCommandLine(); d->m_process->m_setup.m_environment = d->fullEnvironment();