From ce2c072e8e6676cb0a2607960a533f492f8539d3 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 25 May 2022 13:57:59 +0200 Subject: [PATCH] ProjectExplorer: Replace one more use of Runnable::device Change-Id: I58c7b28be9fa54637288099bfca3912d2b7f4935 Reviewed-by: Jarek Kobus --- src/plugins/projectexplorer/runcontrol.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp index 41ab1af5bb8..90554b559bf 100644 --- a/src/plugins/projectexplorer/runcontrol.cpp +++ b/src/plugins/projectexplorer/runcontrol.cpp @@ -1427,7 +1427,9 @@ void SimpleTargetRunnerPrivate::start() } else { QTC_ASSERT(m_state == Inactive, return); - if (!m_runnable.device) { + const IDevice::ConstPtr device = + DeviceManager::deviceForPath(m_runnable.command.executable()); + if (!device) { m_resultData.m_errorString = tr("Cannot run: No device."); m_resultData.m_error = QProcess::FailedToStart; m_resultData.m_exitStatus = QProcess::CrashExit; @@ -1435,7 +1437,7 @@ void SimpleTargetRunnerPrivate::start() return; } - if (!m_runnable.device->isEmptyCommandAllowed() && m_runnable.command.isEmpty()) { + if (!device->isEmptyCommandAllowed() && m_runnable.command.isEmpty()) { m_resultData.m_errorString = tr("Cannot run: No command given."); m_resultData.m_error = QProcess::FailedToStart; m_resultData.m_exitStatus = QProcess::CrashExit;