From b15853e3ea735f5dcb9dc5b8d8c976d95bfc7a04 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 11 Mar 2010 08:44:07 +0100
Subject: [PATCH] Debugger: Fix debugger command line startup.
Protect against session changes at startup.
Reviewed-by: hjk
---
src/plugins/debugger/debuggermanager.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index a235a937e80..8ab999f68df 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -1239,8 +1239,12 @@ void DebuggerManager::sessionLoaded()
void DebuggerManager::aboutToUnloadSession()
{
- if (d->m_engine)
- d->m_engine->shutdown();
+ // Stop debugging the active project when switching sessions.
+ // Note that at startup, session switches may occur, which interfer
+ // with command-line debugging startup.
+ if (d->m_engine && state() != DebuggerNotReady
+ && d->m_startParameters->startMode == StartInternal)
+ d->m_engine->shutdown();
}
void DebuggerManager::aboutToSaveSession()
--
GitLab