aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2025-08-15 10:57:09 +0200
committerhjk <hjk@qt.io>2025-08-15 12:49:37 +0000
commit867677f1120b0e9afaeeebd6ec0dbd50d04b83b3 (patch)
tree4075722b4ce05b1ef64a61818ce2cc2107e43371 /src/plugins
parent02267508367d65da5ec1a41f5a97343e81bfa919 (diff)
RemoteLinux: Don't try to connect when not disconnectedHEADmaster
Change-Id: Iff7a6aa84ddb335969f9b1b6aba8e92c8ebfbcd8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/remotelinux/linuxdevice.cpp5
-rw-r--r--src/plugins/remotelinux/linuxdevicetester.cpp1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index ec4b688f019..496e4426b6a 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -1510,7 +1510,10 @@ bool LinuxDevice::isDisconnected() const
void LinuxDevice::tryToConnect(const Continuation<> &cont) const
{
- d->setupShell(sshParameters(), cont);
+ if (isDisconnected())
+ d->setupShell(sshParameters(), cont);
+ else
+ cont(ResultOk);
}
void LinuxDevice::closeConnection() const
diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp
index 74e6a1ed0dd..aa0d8318c4f 100644
--- a/src/plugins/remotelinux/linuxdevicetester.cpp
+++ b/src/plugins/remotelinux/linuxdevicetester.cpp
@@ -100,6 +100,7 @@ class ConnectionTaskAdapter final
public:
void operator()(ConnectionData *data, Tasking::TaskInterface *iface)
{
+ data->device->closeConnection();
data->device->tryToConnect(Continuation<>(data->guard, [data, iface](const Result<> &res) {
if (data->guard) {
data->result = res;