aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2019-01-08 08:41:58 +0100
committerDavid Schulz <david.schulz@qt.io>2019-01-08 08:50:30 +0000
commit6809848b23cc49c2bebd0c0db3c42490d0ad5eb6 (patch)
tree21f5e6df917e21481ec646a50618b13bdaff6cb4
parent2088121a5f7878e8b86d8044792c2da969747974 (diff)
Debugger: Fix step into after switching operate by instruction
Update m_lastOperateByInstruction by calling adjustOperateByInstruction before checking before checking the value. Change-Id: Ic58da417f83381d9a2300ac0e5fcd2c06f41fc34 Fixes: QTCREATORBUG-21708 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--src/plugins/debugger/cdb/cdbengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 7e541a7acc..e8159b9f0d 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -764,9 +764,9 @@ bool CdbEngine::hasCapability(unsigned cap) const
void CdbEngine::executeStepIn(bool byInstruction)
{
+ adjustOperateByInstruction(byInstruction);
if (!m_lastOperateByInstruction)
m_sourceStepInto = true; // See explanation at handleStackTrace().
- adjustOperateByInstruction(byInstruction);
runCommand({"t", NoFlags}); // Step into-> t (trace)
STATE_DEBUG(state(), Q_FUNC_INFO, __LINE__, "notifyInferiorRunRequested")
notifyInferiorRunRequested();