forked from qt-creator/qt-creator
Debugger: Fix breakpoint enabling
Change-Id: I496d0b90dd572d4f4949c98d5abe035edfba8d19 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -1194,7 +1194,6 @@ void BreakHandler::requestBreakpointRemoval(const Breakpoint &bp)
|
|||||||
void BreakHandler::requestBreakpointEnabling(const Breakpoint &bp, bool enabled)
|
void BreakHandler::requestBreakpointEnabling(const Breakpoint &bp, bool enabled)
|
||||||
{
|
{
|
||||||
if (bp->m_parameters.enabled != enabled) {
|
if (bp->m_parameters.enabled != enabled) {
|
||||||
bp->m_parameters.enabled = enabled;
|
|
||||||
bp->update();
|
bp->update();
|
||||||
requestBreakpointUpdate(bp);
|
requestBreakpointUpdate(bp);
|
||||||
}
|
}
|
||||||
@@ -1538,9 +1537,9 @@ bool BreakHandler::setData(const QModelIndex &idx, const QVariant &value, int ro
|
|||||||
|| (!bps.isEmpty() && bps.at(0)->isEnabled())
|
|| (!bps.isEmpty() && bps.at(0)->isEnabled())
|
||||||
|| (!sbps.isEmpty() && sbps.at(0)->params.enabled);
|
|| (!sbps.isEmpty() && sbps.at(0)->params.enabled);
|
||||||
for (Breakpoint bp : bps) {
|
for (Breakpoint bp : bps) {
|
||||||
requestBreakpointEnabling(bp, !isEnabled);
|
|
||||||
if (GlobalBreakpoint gbp = bp->globalBreakpoint())
|
if (GlobalBreakpoint gbp = bp->globalBreakpoint())
|
||||||
gbp->setEnabled(!isEnabled, false);
|
gbp->setEnabled(!isEnabled, false);
|
||||||
|
requestBreakpointEnabling(bp, !isEnabled);
|
||||||
}
|
}
|
||||||
for (SubBreakpoint sbp : sbps)
|
for (SubBreakpoint sbp : sbps)
|
||||||
requestSubBreakpointEnabling(sbp, !isEnabled);
|
requestSubBreakpointEnabling(sbp, !isEnabled);
|
||||||
@@ -1626,9 +1625,9 @@ bool BreakHandler::contextMenuEvent(const ItemViewEvent &ev)
|
|||||||
!selectedBreakpoints.isEmpty(),
|
!selectedBreakpoints.isEmpty(),
|
||||||
[this, selectedBreakpoints, breakpointsEnabled] {
|
[this, selectedBreakpoints, breakpointsEnabled] {
|
||||||
for (Breakpoint bp : selectedBreakpoints) {
|
for (Breakpoint bp : selectedBreakpoints) {
|
||||||
requestBreakpointEnabling(bp, !breakpointsEnabled);
|
|
||||||
if (GlobalBreakpoint gbp = bp->globalBreakpoint())
|
if (GlobalBreakpoint gbp = bp->globalBreakpoint())
|
||||||
gbp->setEnabled(!breakpointsEnabled, false);
|
gbp->setEnabled(!breakpointsEnabled, false);
|
||||||
|
requestBreakpointEnabling(bp, !breakpointsEnabled);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user