From 13013acf3a4a8e0d9262d72e94f2e844b151d66f Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 17 Mar 2022 12:15:03 +0100
Subject: [PATCH] Finish the shell process on shutdown, before deleting it

Change-Id: I62f3754325da9141e5ab870ff4750109a836b092
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/remotelinux/linuxdevice.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 9db5ad966f2..f1099ed5087 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -193,8 +193,13 @@ class ShellThreadHandler : public QObject
 public:
     ~ShellThreadHandler()
     {
-        if (m_shell)
-            delete m_shell;
+        if (!m_shell)
+            return;
+        if (m_shell->isRunning()) {
+            m_shell->write("exit\n");
+            m_shell->waitForFinished();
+        }
+        delete m_shell;
     }
 
     bool startFailed(const SshConnectionParameters &parameters)