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/GT-2640_ghidravore_decompiler_locations'

Browse Source
This commit is contained in:
ghidravore 2019-05-03 13:58:53 -04:00
commit fb3975e4ef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilerProvider.java
View File

@ -201,10 +201,10 @@ public class DecompilerProvider extends NavigatableComponentProviderAdapter
@Override
public ProgramLocation getLocation() {
if (currentLocation == null) {
return plugin.getCurrentLocation(); // avoid returning null
if (currentLocation instanceof DecompilerLocation) {
return currentLocation;
}
return currentLocation;
return controller.getDecompilerPanel().getCurrentLocation();
}
@Override