mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4237_Dan_breakpointIconsInModelTreeUpdate'

Browse Source
This commit is contained in:
Ryan Kurtz
2024-04-03 13:01:17 -04:00
parent 65f884bb70 7f381964d6
commit 6b32b4c980
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectTreeModel.java
View File

@@ -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();
}
}

2
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/breakpoint/DBTraceObjectBreakpointLocation.java
View File

@@ -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);
}