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

Debugger: Fix handling of enabled state of PDB breakpoints

Browse Source 
Change-Id: Iaa4a7d90e0b5f6ca51acc576b066dcdba9a4efca
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2018-10-16 15:25:55 +02:00
parent c66b2cdef7
commit 24916aa0d3
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/debugger/pdb/pdbengine.cpp
View File

@@ -255,8 +255,24 @@ void PdbEngine::insertBreakpoint(const Breakpoint &bp)
void PdbEngine::updateBreakpoint(const Breakpoint &bp) void PdbEngine::updateBreakpoint(const Breakpoint &bp)
{ {
Q_UNUSED(bp); QTC_ASSERT(bp, return);
QTC_CHECK(false); const BreakpointState state = bp->state();
if (QTC_GUARD(state == BreakpointUpdateRequested))
notifyBreakpointChangeProceeding(bp);
if (bp->responseId().isEmpty()) // FIXME postpone update somehow (QTimer::singleShot?)
return;
// FIXME figure out what needs to be changed (there might be more than enabled state)
const BreakpointParameters &requested = bp->requestedParameters();
if (requested.enabled != bp->isEnabled()) {
if (bp->isEnabled())
postDirectCommand("disable " + bp->responseId());
else
postDirectCommand("enable " + bp->responseId());
bp->setEnabled(!bp->isEnabled());
}
// Pretend it succeeds without waiting for response.
notifyBreakpointChangeOk(bp);
} }
void PdbEngine::removeBreakpoint(const Breakpoint &bp) void PdbEngine::removeBreakpoint(const Breakpoint &bp)
@@ -494,8 +510,12 @@ void PdbEngine::handleOutput2(const QString &data)
bp->setLineNumber(lineNumber); bp->setLineNumber(lineNumber);
bp->adjustMarker(); bp->adjustMarker();
bp->setPending(false); bp->setPending(false);
QTC_CHECK(!bp->needsChange());
notifyBreakpointInsertOk(bp); notifyBreakpointInsertOk(bp);
if (bp->needsChange()) {
bp->gotoState(BreakpointUpdateRequested, BreakpointInserted);
updateBreakpoint(bp);
// QTC_CHECK(!bp->needsChange());
}
} }
} }
} }