Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-22 04:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_Dan_testFixes-2024-09-05-1'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-09-05 08:43:28 -04:00
commit fd7694b0c3
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/tracemgr/DebuggerTraceManagerServicePlugin.java
View File

@ -984,11 +984,11 @@ public class DebuggerTraceManagerServicePlugin extends Plugin
navigationHistoryService.clear(trace.getProgramView());
}
synchronized (listenersByTrace) {
trace.release(this);
lastCoordsByTrace.remove(trace);
trace.removeListener(listenersByTrace.remove(trace));
//Msg.debug(this, "Remaining Consumers of " + trace + ": " + trace.getConsumerList());
}
try {
if (current.getTrace() == trace) {
activate(DebuggerCoordinates.NOWHERE, ActivationCause.ACTIVATE_DEFAULT);
}
@ -996,6 +996,10 @@ public class DebuggerTraceManagerServicePlugin extends Plugin
contextChanged();
}
}
finally {
trace.release(this);
}
}
protected void doCloseTraces(Collection<Trace> traces, Collection<Target> targets) {
for (Trace t : traces) {

2
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/AbstractGhidraHeadedDebuggerTest.java
View File

@ -655,7 +655,7 @@ public abstract class AbstractGhidraHeadedDebuggerTest
if (tb != null) {
if (traceManager != null && traceManager.getOpenTraces().contains(tb.trace)) {
traceManager.closeTrace(tb.trace);
traceManager.closeTraceNoConfirm(tb.trace);
}
tb.close();
}