Commit 6b280866 authored by David Schulz's avatar David Schulz

Debugger: Fix stepping out of disassembled function.

Shows the sourcecode if the frame contains a valid file.

Change-Id: Ie5a38365f5bf5655078872d29066a9cccedf580b
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
parent 9b79adc4
......@@ -1461,18 +1461,8 @@ void CdbEngine::activateFrame(int index)
qDebug("activateFrame idx=%d '%s' %d", index,
qPrintable(frame.file), frame.line);
stackHandler()->setCurrentIndex(index);
const bool showAssembler = !frames.at(index).isUsable();
if (showAssembler) { // Assembly code: Clean out model and force instruction mode.
watchHandler()->removeAllData();
QAction *assemblerAction = theAssemblerAction();
if (assemblerAction->isChecked())
gotoLocation(frame);
else
assemblerAction->trigger(); // Seems to trigger update
} else {
gotoLocation(frame);
updateLocals(true);
}
gotoLocation(frame);
updateLocals(true);
}
void CdbEngine::updateLocals(bool forNewStackFrame)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment