From dedba8c87dab1eae4f567480f1a4bacaa3fcecb6 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 27 Aug 2010 15:38:06 +0200
Subject: [PATCH] debugger: deactivate debug mode if the last engine exits
Task-number: QTCREATORBUG-2201
---
src/plugins/debugger/debuggerplugin.cpp | 7 ++-----
src/plugins/debugger/debuggerplugin.h | 1 -
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 6aa2a77aaba..a1b4c743fc8 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2719,11 +2719,6 @@ void DebuggerPlugin::updateState(DebuggerEngine *engine)
d->updateState(engine);
}
-void DebuggerPlugin::activatePreviousMode()
-{
- d->activatePreviousMode();
-}
-
void DebuggerPlugin::activateDebugMode()
{
d->activateDebugMode();
@@ -2752,6 +2747,8 @@ void DebuggerPlugin::runControlFinished(DebuggerRunControl *runControl)
Q_UNUSED(runControl);
d->m_snapshotHandler->removeSnapshot(runControl);
d->disconnectEngine();
+ if (d->m_snapshotHandler->size() == 0)
+ d->activatePreviousMode();
}
DebuggerLanguages DebuggerPlugin::activeLanguages() const
diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index b1bbc0e3289..80bb7396a94 100644
--- a/src/plugins/debugger/debuggerplugin.h
+++ b/src/plugins/debugger/debuggerplugin.h
@@ -104,7 +104,6 @@ private:
void resetLocation();
void gotoLocation(const QString &fileName, int lineNumber, bool setMarker);
- void activatePreviousMode();
void readSettings();
void writeSettings() const;
--
GitLab