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

Tests - fix for failing FG test

Browse Source
This commit is contained in:
dragonmacher 2019-03-27 18:28:13 -04:00
parent 097cf2e758
commit 00a5a4dc01
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java
View File

@ -170,8 +170,11 @@ public abstract class ComponentProvider implements HelpDescriptor, ActionContext
*/ */
public boolean isFocusedProvider() { public boolean isFocusedProvider() {
DockingWindowManager dwm = DockingWindowManager.getInstance(getComponent()); DockingWindowManager dwm = DockingWindowManager.getInstance(getComponent());
if (dwm == null) {
return false; // can happen in testing
}
ComponentPlaceholder placeholder = dwm.getFocusedComponent(); ComponentPlaceholder placeholder = dwm.getFocusedComponent();
return placeholder.getProvider() == this; return placeholder != null && placeholder.getProvider() == this;
} }
/** /**