feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: don't crash in gotoLocation() if no editor can be created

Browse Source
This commit is contained in:
hjk
2010-12-21 12:30:17 +01:00
parent 6ddee48081
commit 6b13434a45
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/debugger/debuggerengine.cpp
View File

@@ -536,12 +536,18 @@ void DebuggerEngine::gotoLocation(const Location &loc)
const int line = loc.lineNumber();
EditorManager *editorManager = EditorManager::instance();
QList<IEditor *> editors = editorManager->editorsForFileName(file);
IEditor *editor = 0;
if (editors.isEmpty()) {
editors.append(editorManager->openEditor(file, QString(),
EditorManager::IgnoreNavigationHistory));
editors.back()->setProperty(Constants::OPENED_BY_DEBUGGER, true);
editor = editorManager->openEditor(file, QString(),
EditorManager::IgnoreNavigationHistory);
if (editor) {
editors.append(editor);
editor->setProperty(Constants::OPENED_BY_DEBUGGER, true);
}
} else {
editor = editors.back();
}
ITextEditor *texteditor = qobject_cast<ITextEditor *>(editors.back());
ITextEditor *texteditor = qobject_cast<ITextEditor *>(editor);
if (texteditor)
texteditor->gotoLine(line, 0);
@@ -550,7 +556,7 @@ void DebuggerEngine::gotoLocation(const Location &loc)
// FIXME: Breaks with split views.
if (!d->m_memoryAgent.hasVisibleEditor() || loc.needsRaise())
editorManager->activateEditor(editors.back());
editorManager->activateEditor(editor);
//qDebug() << "MEMORY: " << d->m_memoryAgent.hasVisibleEditor();
}