diff options
author | hjk <hjk121@nokiamail.com> | 2014-04-14 13:10:41 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2014-04-14 13:39:59 +0200 |
commit | ce6d69b7c6b036d533781964727624bc09ae2239 (patch) | |
tree | 4750e7732f1f4f69850a0ebf336a3fe6ca9aaccb | |
parent | 929f12eefc65fbf24e9bbb724ed516b154312d3c (diff) |
Debugger: Fix setting breakpoints in disassembly view
This is a regression, the editor was not recognized as being
a disassembly view anymore.
Change-Id: I281ecf0a49bb4e365b252793f6a5aa89f7b432ff
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
-rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index d43bd57b28..00e2d0f262 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -2059,13 +2059,15 @@ void DebuggerPluginPrivate::requestMark(ITextEditor *editor, if (kind != ITextEditor::BreakpointRequest) return; - if (editor->property("DisassemblerView").toBool()) { - QString line = editor->textDocument()->plainText() - .section(QLatin1Char('\n'), lineNumber - 1, lineNumber - 1); - quint64 address = DisassemblerLine::addressFromDisassemblyLine(line); - toggleBreakpointByAddress(address); - } else if (editor->document()) { - toggleBreakpointByFileAndLine(editor->document()->filePath(), lineNumber); + if (IDocument *document = editor->document()) { + if (document->property(Constants::OPENED_WITH_DISASSEMBLY).toBool()) { + QString line = editor->textDocument()->plainText() + .section(QLatin1Char('\n'), lineNumber - 1, lineNumber - 1); + quint64 address = DisassemblerLine::addressFromDisassemblyLine(line); + toggleBreakpointByAddress(address); + } else { + toggleBreakpointByFileAndLine(document->filePath(), lineNumber); + } } } |