diff options
author | hjk <qtc-committer@nokia.com> | 2010-07-07 13:26:32 +0200 |
---|---|---|
committer | hjk <qtc-committer@nokia.com> | 2010-07-07 13:26:32 +0200 |
commit | bcd2146db177ff62cb4ae5e30c43dbc33be5ae75 (patch) | |
tree | 66d96f505983ed76e8d24c67bd86f04140f19330 /src/plugins/debugger/script/scriptengine.cpp | |
parent | c40521b12cf20074aeb3183b15a5fd507720c24f (diff) | |
download | qt-creator-bcd2146db177ff62cb4ae5e30c43dbc33be5ae75.tar.gz |
debugger: don't stop at disabled breakpoints in script engine
Diffstat (limited to 'src/plugins/debugger/script/scriptengine.cpp')
-rw-r--r-- | src/plugins/debugger/script/scriptengine.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
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; |