Debugger: Move part of debugger ramp-down to DebuggerRunTool

DebuggerRunTool and debugger backend process have (almost) a 1:1
correspondence, unlike engines or the debugger plugin itself.
So it makes sense to accumulate backend start/rampdown login
in DebuggerRunTool.

Change-Id: Ia105283bcdf2641c7e9a401b4146b34c20605ba7
Reviewed-by: Christian Stenger <[email protected]>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index a651726970b..d8319a9f890 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -783,8 +783,8 @@ public:
 
     void handleAbort()
     {
-        currentEngine()->resetLocation();
-        currentEngine()->abortDebugger();
+        if (dd->m_currentRunTool)
+            dd->m_currentRunTool->abortDebugger();
     }
 
     void handleReset()
@@ -2799,9 +2799,9 @@ void DebuggerPluginPrivate::aboutToShutdown()
     m_shutdownTimer.setInterval(0);
     m_shutdownTimer.setSingleShot(true);
     connect(&m_shutdownTimer, &QTimer::timeout, this, &DebuggerPluginPrivate::doShutdown);
-    if (DebuggerEngine *engine = currentEngine()) {
-        if (engine->state() != Debugger::DebuggerNotReady) {
-            engine->abortDebugger();
+    if (dd->m_currentRunTool) {
+        if (dd->m_currentRunTool->engine()->state() != Debugger::DebuggerNotReady) {
+            dd->m_currentRunTool->abortDebugger();
             m_shutdownTimer.setInterval(3000);
         }
     }