diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp index c347dd79e47..686d4ce7126 100644 --- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp @@ -80,7 +80,11 @@ SshDeviceProcess::~SshDeviceProcess() void SshDeviceProcess::start(const Runnable &runnable) { QTC_ASSERT(d->state == SshDeviceProcessPrivate::Inactive, return); - QTC_ASSERT(runnable.is(), return); + if (!runnable.is()) { + d->errorMessage = tr("Internal error"); + error(QProcess::FailedToStart); + return; + } d->setState(SshDeviceProcessPrivate::Connecting); d->errorMessage.clear(); diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp index 3d79335b5c6..c0da4463aee 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp +++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp @@ -30,6 +30,7 @@ #include #include #include +#include using namespace ProjectExplorer; @@ -58,7 +59,9 @@ void RemoteLinuxEnvironmentReader::start() this, &RemoteLinuxEnvironmentReader::handleError); connect(m_deviceProcess, &DeviceProcess::finished, this, &RemoteLinuxEnvironmentReader::remoteProcessFinished); - m_deviceProcess->start(QLatin1String("env")); + StandardRunnable runnable; + runnable.executable = QLatin1String("env"); + m_deviceProcess->start(runnable); } void RemoteLinuxEnvironmentReader::stop()