GP-4237: Fix breakpoint icon update in Model. Fix margin state from

loc&spec
NationalSecurityAgency · Apr 2, 2024 · 7f38196 · 7f38196
1 parent 5bf2f6b
commit 7f38196
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.../Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectTreeModel.java b/.../Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectTreeModel.java
@@ -768,6 +768,7 @@ protected void refresh() {
  for (AbstractNode node : nodeCache.byObject.values()) {
  node.fireNodeChanged();
  }
+ root.fireNodeChanged();
  }
 
  protected void reload() {
@@ -779,8 +780,10 @@ protected void reloadSameTrace() {
  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/...eling/src/main/java/ghidra/trace/database/breakpoint/DBTraceObjectBreakpointLocation.java b/...eling/src/main/java/ghidra/trace/database/breakpoint/DBTraceObjectBreakpointLocation.java
@@ -244,7 +244,7 @@ public boolean isEnabled(long snap) {
  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);
  }