diff options
| author | hjk <qtc-committer@nokia.com> | 2010-07-20 18:14:41 +0200 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2010-07-20 18:54:50 +0200 |
| commit | 62060ce79c840cbe290125023a05bc150ea12e82 (patch) | |
| tree | d3bac466e0830d90ee7b6a790641a7e08cf20416 | |
| parent | 8d54298c8ebb2553ec72fcc5d95b8eef92a7d470 (diff) | |
| download | qt-creator-62060ce79c840cbe290125023a05bc150ea12e82.tar.gz | |
debugger: make requestMark() more robust for editors not representing files
| -rw-r--r-- | src/plugins/debugger/debuggerengine.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 72ce9061d1..fa740f1e59 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 1871930c40..acd27c8b6b 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); } |