From 3fcceedd3579e626cae15aba6d940407f9aa5258 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 18 Aug 2010 15:25:49 +0200
Subject: [PATCH] debugger: fix context updates
done by Lasse
---
src/plugins/debugger/debuggerplugin.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 31e2ec2a705..d65636d6212 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -261,7 +261,7 @@
// | |
// | |
// {notify- {notify-
-// Inferior- Inferior-
+// Engine- Engine-
// ShutdownOk} ShutdownFailed}
// + +
// EngineShutdownOk EngineShutdownFailed
@@ -2214,10 +2214,11 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
const bool isContinuable = (engine->state() == InferiorStopOk);
const bool isInterruptible = (engine->state() == InferiorRunOk);
ICore *core = ICore::instance();
+
if (isContinuable) {
- core->updateAdditionalContexts(Core::Context(), m_continuableContext);
+ core->updateAdditionalContexts(m_interruptibleContext, m_continuableContext);
} else if (isInterruptible) {
- core->updateAdditionalContexts(Core::Context(), m_interruptibleContext);
+ core->updateAdditionalContexts(m_continuableContext, m_interruptibleContext);
} else {
core->updateAdditionalContexts(m_continuableContext, Core::Context());
core->updateAdditionalContexts(m_interruptibleContext, Core::Context());
--
GitLab