yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2022-03-11 02:05:10 -05:00
commit b4216a829f
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ghidra/Framework/Docking/src/main/java/docking/menu/MultiStateDockingAction.java
View file

@ -23,6 +23,7 @@ import javax.swing.JButton;
import docking.ActionContext; import docking.ActionContext;
import docking.action.*; import docking.action.*;
import docking.help.Help;
import docking.widgets.EventTrigger; import docking.widgets.EventTrigger;
import ghidra.util.HelpLocation; import ghidra.util.HelpLocation;
import ghidra.util.Swing; import ghidra.util.Swing;
@ -329,7 +330,7 @@ public abstract class MultiStateDockingAction<T> extends DockingAction {
private final ActionState<T> actionState; private final ActionState<T> actionState;
private ActionStateAction(ActionState<T> actionState, boolean isSelected) { private ActionStateAction(ActionState<T> actionState, boolean isSelected) {
super(actionState.getName(), "multiStateAction"); super(actionState.getName(), "MultiStateAction");
this.actionState = actionState; this.actionState = actionState;
setMenuBarData( setMenuBarData(
@ -338,6 +339,11 @@ public abstract class MultiStateDockingAction<T> extends DockingAction {
if (helpLocation != null) { if (helpLocation != null) {
setHelpLocation(helpLocation); setHelpLocation(helpLocation);
} }
else {
HelpLocation parentHelp =
Help.getHelpService().getHelpLocation(MultiStateDockingAction.this);
setHelpLocation(parentHelp);
}
} }
@Override @Override