diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp index f8da814b7a6..4a6539befff 100644 --- a/src/plugins/projectexplorer/runcontrol.cpp +++ b/src/plugins/projectexplorer/runcontrol.cpp @@ -1394,20 +1394,18 @@ void SimpleTargetRunnerPrivate::start() { const bool isLocal = !m_command.executable().needsDevice(); + CommandLine cmdLine = m_command; + Environment env = m_environment; + m_resultData = {}; QTC_ASSERT(m_state == Inactive, return); if (isLocal) { - Environment env = m_environment; if (m_runAsRoot) RunControl::provideAskPassEntry(env); - m_process.setEnvironment(env); - WinDebugInterface::startIfNeeded(); - CommandLine cmdLine = m_command; - if (HostOsInfo::isMacHost()) { CommandLine disclaim(Core::ICore::libexecPath("disclaim")); disclaim.addCommandLineAsArgs(cmdLine); @@ -1415,7 +1413,6 @@ void SimpleTargetRunnerPrivate::start() } m_process.setRunAsRoot(m_runAsRoot); - m_process.setCommand(cmdLine); } const IDevice::ConstPtr device = DeviceManager::deviceForPath(m_command.executable()); @@ -1429,8 +1426,8 @@ void SimpleTargetRunnerPrivate::start() m_stopRequested = false; - m_process.setCommand(m_command); - m_process.setEnvironment(m_environment); + m_process.setCommand(cmdLine); + m_process.setEnvironment(env); m_process.setExtraData(m_extraData); m_state = Run;