From 43b25e6d99cae76d67ba7a5a050d6e12c3ab117c Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Wed, 28 Oct 2020 10:29:52 +0100
Subject: [PATCH] Debugger: Fix breakpoint enabling

Change-Id: I496d0b90dd572d4f4949c98d5abe035edfba8d19
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/debugger/breakhandler.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 1de7d332697..a8eefd92e61 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -1194,7 +1194,6 @@ void BreakHandler::requestBreakpointRemoval(const Breakpoint &bp)
 void BreakHandler::requestBreakpointEnabling(const Breakpoint &bp, bool enabled)
 {
     if (bp->m_parameters.enabled != enabled) {
-        bp->m_parameters.enabled = enabled;
         bp->update();
         requestBreakpointUpdate(bp);
     }
@@ -1538,9 +1537,9 @@ bool BreakHandler::setData(const QModelIndex &idx, const QVariant &value, int ro
                             || (!bps.isEmpty() && bps.at(0)->isEnabled())
                             || (!sbps.isEmpty() && sbps.at(0)->params.enabled);
                     for (Breakpoint bp : bps) {
-                        requestBreakpointEnabling(bp, !isEnabled);
                         if (GlobalBreakpoint gbp = bp->globalBreakpoint())
                             gbp->setEnabled(!isEnabled, false);
+                        requestBreakpointEnabling(bp, !isEnabled);
                     }
                     for (SubBreakpoint sbp : sbps)
                         requestSubBreakpointEnabling(sbp, !isEnabled);
@@ -1626,9 +1625,9 @@ bool BreakHandler::contextMenuEvent(const ItemViewEvent &ev)
               !selectedBreakpoints.isEmpty(),
               [this, selectedBreakpoints, breakpointsEnabled] {
                     for (Breakpoint bp : selectedBreakpoints) {
-                        requestBreakpointEnabling(bp, !breakpointsEnabled);
                         if (GlobalBreakpoint gbp = bp->globalBreakpoint())
                             gbp->setEnabled(!breakpointsEnabled, false);
+                        requestBreakpointEnabling(bp, !breakpointsEnabled);
                     }
               }
     );