mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-05-20 19:01:35 +08:00
Merge remote-tracking branch 'origin/GP-6391_d-millar_refresh_on_break'
This commit is contained in:
+4
@@ -225,6 +225,10 @@ public class DebuggerTrackLocationTrait {
|
||||
return trackedLocation;
|
||||
}
|
||||
|
||||
public void clearTrackedLocation() {
|
||||
trackedLocation = null;
|
||||
}
|
||||
|
||||
public MultiStateDockingAction<LocationTrackingSpec> installAction() {
|
||||
// TODO: Only those Sleigh expressions applicable to the current thread's registers?
|
||||
action = DebuggerTrackLocationAction.builder(plugin)
|
||||
|
||||
+3
-1
@@ -818,7 +818,8 @@ public class DebuggerListingProvider extends CodeViewerProvider {
|
||||
!gotoProgram.getMemory().contains(location.getAddress())) {
|
||||
return false;
|
||||
}
|
||||
if (super.goTo(gotoProgram, location)) {
|
||||
if (super.goTo(gotoProgram, location) &&
|
||||
!isEffectivelyDifferent(getLocation(), location)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -938,6 +939,7 @@ public class DebuggerListingProvider extends CodeViewerProvider {
|
||||
}
|
||||
else {
|
||||
trackingLabel.setForeground(Colors.ERROR);
|
||||
trackingTrait.clearTrackedLocation();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user