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 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2022-12-06 02:10:33 -05:00
parent 1cdb59e1bb 982997256e
commit a5c26f49ca
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/ProgramDiffPlugin.java
View File

@@ -295,7 +295,8 @@ public class ProgramDiffPlugin extends ProgramPlugin
AddressIndexMap p2IndexMap = new AddressIndexMap(p1AddressSetAsP2); AddressIndexMap p2IndexMap = new AddressIndexMap(p1AddressSetAsP2);
markerManager.getOverviewProvider().setProgram(secondaryDiffProgram, p2IndexMap); markerManager.getOverviewProvider().setProgram(secondaryDiffProgram, p2IndexMap);
fp.setBackgroundColorModel( fp.setBackgroundColorModel(
new MarkerServiceBackgroundColorModel(markerManager, p2IndexMap)); new MarkerServiceBackgroundColorModel(markerManager, secondaryDiffProgram,
p2IndexMap));
currentSelection = previousP1Selection; currentSelection = previousP1Selection;
p2DiffHighlight = previousP2DiffHighlight; p2DiffHighlight = previousP2DiffHighlight;