From 6b2808663304c5293835c764f4ffb55fa3f5b3b3 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 15 Feb 2013 08:33:37 -0800 Subject: [PATCH] Debugger: Fix stepping out of disassembled function. Shows the sourcecode if the frame contains a valid file. Change-Id: Ie5a38365f5bf5655078872d29066a9cccedf580b Reviewed-by: Friedemann Kleint --- src/plugins/debugger/cdb/cdbengine.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 0becdc3de77..c597a5e1ec3 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -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)