From 9c4bd40f7c21c13f993368d3e64bdb90da4ecc25 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 12 Feb 2024 16:36:10 +0100
Subject: [PATCH] Debugger: Fix Qml debugger rampdown when not fully started

Fixes: QTCREATORBUG-30355
Change-Id: I3e7c1ef56db1fe48f5b571d21f89d20b7936cfb7
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/debugger/qml/qmlengine.cpp | 15 ++-------------
 src/plugins/debugger/qml/qmlengine.h   |  1 -
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 7c907678aed..d271d15c5a5 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -208,7 +208,6 @@ public:
     bool unpausedEvaluate = false;
     bool contextEvaluate = false;
     bool supportChangeBreakpoint = false;
-    bool hasQuit = false;
 
     QTimer connectionTimer;
     QmlDebug::QDebugMessageClient *msgClient = nullptr;
@@ -380,7 +379,7 @@ void QmlEngine::beginConnection()
 
 void QmlEngine::connectionStartupFailed()
 {
-    if (d->hasQuit)
+    if (isDying())
         return;
 
     if (d->retryOnConnectFail) {
@@ -502,8 +501,7 @@ void QmlEngine::startProcess()
 
 void QmlEngine::stopProcess()
 {
-    if (d->process.isRunning())
-        d->process.close();
+    d->process.close();
 }
 
 void QmlEngine::shutdownInferior()
@@ -937,15 +935,6 @@ bool QmlEngine::hasCapability(unsigned cap) const
         | AddWatcherCapability;*/
 }
 
-void QmlEngine::quitDebugger()
-{
-    d->automaticConnect = false;
-    d->retryOnConnectFail = false;
-    d->hasQuit = true;
-    stopProcess();
-    closeConnection();
-}
-
 void QmlEngine::doUpdateLocals(const UpdateParameters &params)
 {
     d->updateLocals(params.qmlFocusOnFrame);
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h
index 2006ce081ff..7c609e12496 100644
--- a/src/plugins/debugger/qml/qmlengine.h
+++ b/src/plugins/debugger/qml/qmlengine.h
@@ -91,7 +91,6 @@ private:
 
     bool companionPreventsActions() const override;
     bool hasCapability(unsigned) const override;
-    void quitDebugger() override;
 
     void doUpdateLocals(const UpdateParameters &params) override;
     Core::Context languageContext() const override;