From b7e6faf2dc235d05cbad7bef21d7e666f57677b2 Mon Sep 17 00:00:00 2001 From: ghidravore Date: Fri, 26 Jun 2020 14:35:03 -0400 Subject: [PATCH] fixes #1810 broken toolbar actions on nodes in the function graph --- .../main/java/docking/menu/ToolBarItemManager.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Ghidra/Framework/Docking/src/main/java/docking/menu/ToolBarItemManager.java b/Ghidra/Framework/Docking/src/main/java/docking/menu/ToolBarItemManager.java index 0856d8caf9..1c074f03e7 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/menu/ToolBarItemManager.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/menu/ToolBarItemManager.java @@ -113,7 +113,7 @@ public class ToolBarItemManager implements PropertyChangeListener, ActionListene @Override public void actionPerformed(ActionEvent event) { DockingWindowManager.clearMouseOverHelp(); - ActionContext context = windowManager.getActionContext(toolBarAction); + ActionContext context = getActionContext(); context.setSourceObject(event.getSource()); @@ -130,6 +130,18 @@ public class ToolBarItemManager implements PropertyChangeListener, ActionListene }); } + private ActionContext getActionContext() { + if (windowManager != null) { + return windowManager.getActionContext(toolBarAction); + } + + ComponentProvider provider = getComponentProvider(); + ActionContext context = provider == null ? null : provider.getActionContext(null); + final ActionContext actionContext = + context == null ? new ActionContext(provider, null) : context; + return actionContext; + } + @Override public String toString() { return toolBarAction.getName();