mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-09-07 09:11:15 -09:00
Merge remote-tracking branch 'origin/patch'
This commit is contained in:
@@ -295,7 +295,8 @@ public class ProgramDiffPlugin extends ProgramPlugin
|
||||
AddressIndexMap p2IndexMap = new AddressIndexMap(p1AddressSetAsP2);
|
||||
markerManager.getOverviewProvider().setProgram(secondaryDiffProgram, p2IndexMap);
|
||||
fp.setBackgroundColorModel(
|
||||
new MarkerServiceBackgroundColorModel(markerManager, p2IndexMap));
|
||||
new MarkerServiceBackgroundColorModel(markerManager, secondaryDiffProgram,
|
||||
p2IndexMap));
|
||||
|
||||
currentSelection = previousP1Selection;
|
||||
p2DiffHighlight = previousP2DiffHighlight;
|
||||
|
||||
Reference in New Issue
Block a user