From ef9623d32ffbd32af9bb4726f3945351fa72aed7 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 7 Jun 2011 17:21:45 +0200
Subject: [PATCH] debugger: fix a case of "overcompensation" when correcting
breakpoint lines
Change-Id: Idfca9513926004f5ab67c29838fc18c963a57a4b
Reviewed-on: http://codereview.qt.nokia.com/366
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/debugger/breakhandler.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 0e7e568c93..8cd2bf55d5 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -1051,7 +1051,9 @@ void BreakHandler::updateLineNumberFromMarker(BreakpointId id, int lineNumber)
// Ignore updates to the "real" line number while the debugger is
// running, as this can be triggered by moving the breakpoint to
// the next line that generated code.
- if (isEngineRunning(id))
+ if (it->data.lineNumber == lineNumber)
+ ; // Nothing
+ else if (isEngineRunning(id))
it->data.lineNumber += lineNumber - it->response.lineNumber;
else
it->data.lineNumber = lineNumber;
--
GitLab