Skip to content
Snippets Groups Projects
Commit 7a2fc356 authored by hjk's avatar hjk
Browse files

debugger: fix breakpoint markers in disassembler view

Task-number: QTCREATORBUG-3667
parent 7296cd0f
No related branches found
No related tags found
No related merge requests found
...@@ -189,7 +189,7 @@ BreakpointId BreakHandler::findBreakpointByAddress(quint64 address) const ...@@ -189,7 +189,7 @@ BreakpointId BreakHandler::findBreakpointByAddress(quint64 address) const
{ {
ConstIterator it = m_storage.constBegin(), et = m_storage.constEnd(); ConstIterator it = m_storage.constBegin(), et = m_storage.constEnd();
for ( ; it != et; ++it) for ( ; it != et; ++it)
if (it->data.address == address) if (it->data.address == address || it->response.address == address)
return it.key(); return it.key();
return BreakpointId(); return BreakpointId();
} }
......
...@@ -327,7 +327,7 @@ void DisassemblerAgent::updateBreakpointMarkers() ...@@ -327,7 +327,7 @@ void DisassemblerAgent::updateBreakpointMarkers()
d->editor->markableInterface()->removeMark(marker); d->editor->markableInterface()->removeMark(marker);
d->breakpointMarks.clear(); d->breakpointMarks.clear();
foreach (BreakpointId id, ids) { foreach (BreakpointId id, ids) {
const quint64 address = handler->address(id); const quint64 address = handler->response(id).address;
if (!address) if (!address)
continue; continue;
const int lineNumber = contents.lineForAddress(address); const int lineNumber = contents.lineForAddress(address);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment