mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-19 16:40:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-5540_Dan_guardAgainstNullTraceManager' (Closes #7956)
This commit is contained in:
Ryan Kurtz
2025-04-09 13:38:09 -04:00
parent 703c2b37bd 8d7d13fac3
commit 313f2d2847
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/trace/DebuggerTraceTabPanel.java
View File

@@ -101,24 +101,27 @@ public class DebuggerTraceTabPanel extends GTabPanel<Trace>
.buildAndInstall(tool);
actionCloseAllTraces = CloseAllTracesAction.builderPopup(plugin)
.withContext(DebuggerTraceFileActionContext.class)
.popupWhen(c -> !traceManager.getOpenTraces().isEmpty())
.popupWhen(c -> traceManager != null && !traceManager.getOpenTraces().isEmpty())
.onAction(c -> traceManager.closeAllTraces())
.buildAndInstall(tool);
actionCloseOtherTraces = CloseOtherTracesAction.builderPopup(plugin)
.withContext(DebuggerTraceFileActionContext.class)
.popupWhen(c -> traceManager.getOpenTraces().size() > 1 && c.getTrace() != null)
.popupWhen(c -> traceManager != null && traceManager.getOpenTraces().size() > 1 &&
c.getTrace() != null)
.onAction(c -> traceManager.closeOtherTraces(c.getTrace()))
.buildAndInstall(tool);
actionCloseDeadTraces = CloseDeadTracesAction.builderPopup(plugin)
.withContext(DebuggerTraceFileActionContext.class)
.popupWhen(c -> !traceManager.getOpenTraces().isEmpty() && targetService != null)
.popupWhen(c -> traceManager != null && !traceManager.getOpenTraces().isEmpty() &&
targetService != null)
.onAction(c -> traceManager.closeDeadTraces())
.buildAndInstall(tool);
}
private String getNameForTrace(Trace trace) {
String name = DomainObjectDisplayUtils.getTabText(trace);
DebuggerCoordinates current = traceManager.getCurrentFor(trace);
DebuggerCoordinates current =
traceManager == null ? DebuggerCoordinates.NOWHERE : traceManager.getCurrentFor(trace);
if (current == DebuggerCoordinates.NOWHERE) {
// TODO: Could use view's snap and time table's schedule
return name + " (?)";
@@ -209,6 +212,9 @@ public class DebuggerTraceTabPanel extends GTabPanel<Trace>
private void traceTabSelected(Trace newTrace) {
cbCoordinateActivation.invoke(() -> {
if (traceManager == null) {
return;
}
traceManager.activateTrace(newTrace);
});
}