From bcd2146db177ff62cb4ae5e30c43dbc33be5ae75 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 7 Jul 2010 13:26:32 +0200 Subject: debugger: don't stop at disabled breakpoints in script engine --- src/plugins/debugger/script/scriptengine.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/plugins/debugger/script/scriptengine.cpp') diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp index ca73b14a59..3a8c872436 100644 --- a/src/plugins/debugger/script/scriptengine.cpp +++ b/src/plugins/debugger/script/scriptengine.cpp @@ -595,8 +595,10 @@ bool ScriptEngine::checkForBreakCondition(bool byFunction) // Update breakpoints const QString functionName = info.functionName(); const QString fileName = info.fileName(); - const int lineNumber = byFunction? info.functionStartLineNumber() : info.lineNumber(); - SDEBUG("checkForBreakCondition" << byFunction << functionName << lineNumber << fileName); + const int lineNumber = byFunction + ? info.functionStartLineNumber() : info.lineNumber(); + SDEBUG("checkForBreakCondition" << byFunction << functionName + << lineNumber << fileName); if (m_stopOnNextLine) { // Interrupt inferior m_stopOnNextLine = false; @@ -609,7 +611,11 @@ bool ScriptEngine::checkForBreakCondition(bool byFunction) if (!data) return false; - // we just run into a breakpoint + // Skip disabled breakpoint. + if (!data->enabled) + return false; + + // We just run into a breakpoint. //SDEBUG("RESOLVING BREAKPOINT AT " << fileName << lineNumber); data->bpLineNumber = QByteArray::number(lineNumber); data->bpFileName = fileName; -- cgit v1.2.1