mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-10-19 18:12:14 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-1395: Review changes.

Browse Source
This commit is contained in:
Dan
2021-10-20 13:34:57 -04:00
parent 77f8906a23
commit d70053c11b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/breakpoint/DebuggerBreakpointMarkerPlugin.java
View File

@@ -965,7 +965,7 @@ public class DebuggerBreakpointMarkerPlugin extends Plugin
*/
Trace trace = getTraceFromContext(context);
boolean mapped = breakpointService.anyMapped(bs, trace);
Enablement toggled = en = en.getToggled(mapped);
Enablement toggled = en.getToggled(mapped);
if (toggled.enabled) {
breakpointService.enableAll(bs, trace).exceptionally(ex -> {
breakpointError(title, "Could not enable breakpoints", ex);
@@ -1049,10 +1049,12 @@ public class DebuggerBreakpointMarkerPlugin extends Plugin
@AutoServiceConsumed
private void setMarkerService(MarkerService markerService) {
if (this.markerService != null) {
this.markerService.setMarkerClickedListener(null);
}
this.markerService = markerService;
// NB. There's no way to remove such a listener...
if (markerService != null) {
markerService.setMarkerClickedListener(markerClickedListener);
if (this.markerService != null) {
this.markerService.setMarkerClickedListener(markerClickedListener);
}
}