From 62060ce79c840cbe290125023a05bc150ea12e82 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 20 Jul 2010 18:14:41 +0200
Subject: [PATCH] debugger: make requestMark() more robust for editors not
representing files
---
src/plugins/debugger/debuggerengine.cpp | 1 +
src/plugins/debugger/debuggerplugin.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 72ce9061d1f..fa740f1e590 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -1193,6 +1193,7 @@ void DebuggerEnginePrivate::doInterruptInferior()
void DebuggerEnginePrivate::doShutdownInferior()
{
+ QTC_ASSERT(state() == InferiorShutdownRequested, qDebug() << state());
m_engine->resetLocation();
m_targetState = DebuggerFinished;
m_engine->showMessage(_("CALL: SHUTDOWN INFERIOR"));
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 1871930c409..acd27c8b6b2 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1906,7 +1906,7 @@ void DebuggerPluginPrivate::toggleBreakpoint(const QString &fileName, int lineNu
void DebuggerPluginPrivate::requestMark(ITextEditor *editor, int lineNumber)
{
- if (isDebuggable(editor))
+ if (isDebuggable(editor) && editor && editor->file())
toggleBreakpoint(editor->file()->fileName(), lineNumber);
}
--
GitLab