From d42e1756ef7d7701bd25285a78ae1b540cfc24b5 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 11 Jul 2023 22:25:53 +0200 Subject: [PATCH] AbstractProcessStep: Make isExecutableFile check a part of setupProcess Task-number: QTCREATORBUG-29168 Change-Id: I47cc43f1465528354802fdc033fc6369e413b526 Reviewed-by: hjk --- .../projectexplorer/abstractprocessstep.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index 71400786de6..a89a7eb5137 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -177,14 +177,6 @@ void AbstractProcessStep::setupOutputFormatter(OutputFormatter *formatter) void AbstractProcessStep::doRun() { - if (!d->m_param.effectiveCommand().isExecutableFile()) { - emit addOutput(Tr::tr("The program \"%1\" does not exist or is not executable.") - .arg(d->m_displayedParams->effectiveCommand().toUserOutput()), - OutputFormat::ErrorMessage); - finish(ProcessResult::StartFailed); - return; - } - setupStreams(); d->m_process.reset(new Process); @@ -218,6 +210,13 @@ bool AbstractProcessStep::setupProcess(Process &process) OutputFormat::ErrorMessage); return false; } + if (!d->m_param.effectiveCommand().isExecutableFile()) { + emit addOutput(Tr::tr("The program \"%1\" does not exist or is not executable.") + .arg(d->m_displayedParams->effectiveCommand().toUserOutput()), + OutputFormat::ErrorMessage); + return false; + } + process.setUseCtrlCStub(HostOsInfo::isWindowsHost()); process.setWorkingDirectory(workingDir); // Enforce PWD in the environment because some build tools use that.