From 7f381964d6ec6ad915a9de8e33c9731403698554 Mon Sep 17 00:00:00 2001 From: Dan <46821332+nsadeveloper789@users.noreply.github.com> Date: Tue, 2 Apr 2024 14:58:57 -0400 Subject: [PATCH] GP-4237: Fix breakpoint icon update in Model. Fix margin state from loc&spec --- .../app/plugin/core/debug/gui/model/ObjectTreeModel.java | 3 +++ .../database/breakpoint/DBTraceObjectBreakpointLocation.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectTreeModel.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectTreeModel.java index 63fd754b1a..d1216b9771 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectTreeModel.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectTreeModel.java @@ -768,6 +768,7 @@ public class ObjectTreeModel implements DisplaysModified { for (AbstractNode node : nodeCache.byObject.values()) { node.fireNodeChanged(); } + root.fireNodeChanged(); } protected void reload() { @@ -779,8 +780,10 @@ public class ObjectTreeModel implements DisplaysModified { try (LockHold hold = trace == null ? null : trace.lockRead()) { for (AbstractNode node : List.copyOf(nodeCache.byObject.values())) { node.reloadChildrenNow(); + node.fireNodeChanged(); } root.reloadChildrenNow(); + root.fireNodeChanged(); } } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/breakpoint/DBTraceObjectBreakpointLocation.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/breakpoint/DBTraceObjectBreakpointLocation.java index ef19929a83..a64c98b708 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/breakpoint/DBTraceObjectBreakpointLocation.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/breakpoint/DBTraceObjectBreakpointLocation.java @@ -244,7 +244,7 @@ public class DBTraceObjectBreakpointLocation Boolean locEn = TraceObjectInterfaceUtils.getValue(object, snap, TargetBreakpointSpec.ENABLED_ATTRIBUTE_NAME, Boolean.class, null); if (locEn != null) { - return locEn; + return locEn && getSpecification().isEnabled(snap); } return getSpecification().isEnabled(snap); }