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

Debugger: Fix stepping out of disassembled function.

Browse Source 
Shows the sourcecode if the frame contains a valid file.

Change-Id: Ie5a38365f5bf5655078872d29066a9cccedf580b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
David Schulz
2013-02-15 08:33:37 -08:00
parent 9b79adc4ba
commit 6b28086633
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -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)