Skip to content

Ghidra is a software reverse engineering (SRE) framework

Test fixes

dragonmacher2394103ea5f5
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/GlobalMenuAndToolBarManager.java b/Ghidra/Framework/Docking/src/main/java/docking/GlobalMenuAndToolBarManager.java
index 61dde3d598..1894e9df69 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/GlobalMenuAndToolBarManager.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/GlobalMenuAndToolBarManager.java
@@ -212,8 +212,12 @@ public class GlobalMenuAndToolBarManager implements DockingWindowListener {
KeyboardFocusManager kfm = KeyboardFocusManager.getCurrentKeyboardFocusManager();
Window w = kfm.getFocusedWindow();
if (w instanceof DockingDialog dialog) {
+ // the provider can be null when the dialog has been closed, but the Java focus transfer
+ // has not yet completed
DialogComponentProvider provider = dialog.getDialogComponent();
- return provider.getActionContext(null);
+ if (provider != null) {
+ return provider.getActionContext(null);
+ }
}
return getComponentProviderContext(focusedWindowNode);