feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

FileTransfer: Don't crash when used for non-linux device

Browse Source 
Don't crash when start() was called for non-linux device.

Change-Id: I1722ea420ed0fe74418c1c9a6f8702ae079b7bd7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-05-20 11:50:52 +02:00
parent c0333b2b68
commit 576f49df24
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -1490,6 +1490,7 @@ public:
void setDevice(const ProjectExplorer::IDeviceConstPtr &device) void setDevice(const ProjectExplorer::IDeviceConstPtr &device)
{ {
m_device = device; m_device = device;
m_devicePrivate = nullptr;
if (m_device) { if (m_device) {
const LinuxDevice *linuxDevice = m_device.dynamicCast<const LinuxDevice>().get(); const LinuxDevice *linuxDevice = m_device.dynamicCast<const LinuxDevice>().get();
QTC_ASSERT(linuxDevice, return); QTC_ASSERT(linuxDevice, return);
@@ -1504,6 +1505,12 @@ public:
void start() void start()
{ {
if (!m_devicePrivate) {
startFailed(tr("Transferring files to/from non-linux device "
"isn't supported currently."));
return;
}
m_sshParameters = displayless(m_devicePrivate->q->sshParameters()); m_sshParameters = displayless(m_devicePrivate->q->sshParameters());
if (SshSettings::connectionSharingEnabled()) { if (SshSettings::connectionSharingEnabled()) {
m_connecting = true; m_connecting = true;
@@ -1822,9 +1829,12 @@ void FileTransferPrivate::run(RunMode mode)
if (m_files.isEmpty()) if (m_files.isEmpty())
return startFailed(tr("No files to transfer.")); return startFailed(tr("No files to transfer."));
if (!m_device)
return startFailed(tr("No device set for transfer."));
direction = transferDirection(m_files); direction = transferDirection(m_files);
if (direction == TransferDirection::Invalid) if (direction == TransferDirection::Invalid)
return startFailed(tr("Mixing different types on transfer in one go.")); return startFailed(tr("Mixing different types of transfer in one go."));
if (!isDeviceMatched(m_files, m_device->id().toString())) if (!isDeviceMatched(m_files, m_device->id().toString()))
return startFailed(tr("Trying to transfer into / from not matching device.")); return startFailed(tr("Trying to transfer into / from not matching device."));