yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

Fixed the Close action to not close the Front End provider

Browse source
This commit is contained in:
dragonmacher 2025-02-24 18:47:46 -05:00
parent 93c19e3cc6
commit e767916357
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Framework/Docking/src/main/java/docking/DockableToolBarManager.java
View file

@ -206,13 +206,19 @@ class DockableToolBarManager {
@Override @Override
public boolean isEnabledForContext(ActionContext context) { public boolean isEnabledForContext(ActionContext context) {
DockingWindowManager dwm = DockingWindowManager.getActiveInstance();
ComponentProvider provider = context.getComponentProvider(); ComponentProvider provider = context.getComponentProvider();
if (provider == null) { if (provider == null) {
// Some context providers do not specify the provider when creating a contexts // Some context providers do not specify the provider when creating a contexts
DockingWindowManager dwm = DockingWindowManager.getActiveInstance();
provider = dwm.getActiveComponentProvider(); provider = dwm.getActiveComponentProvider();
} }
return provider == dockableComponent.getComponentProvider();
if (provider != dockableComponent.getComponentProvider()) {
return false;
}
// don't allow the last component in a window to be closed to prevent an empty window
return !dwm.isLastComponentInWindow(provider);
} }
} }

3
Ghidra/Framework/Docking/src/main/java/docking/action/ShowActionChooserDialogAction.java
View file

@ -56,6 +56,9 @@ public class ShowActionChooserDialogAction extends DockingAction {
private void showActionsDialog(Tool tool, DockingFrame frame, ActionContext context) { private void showActionsDialog(Tool tool, DockingFrame frame, ActionContext context) {
ComponentProvider provider = tool.getWindowManager().getActiveComponentProvider(); ComponentProvider provider = tool.getWindowManager().getActiveComponentProvider();
if (provider == null) {
return; // this can happen if there is no active provider
}
ActionChooserDialog actionsDialog = new ActionChooserDialog(tool, provider, context); ActionChooserDialog actionsDialog = new ActionChooserDialog(tool, provider, context);
tool.showDialog(actionsDialog); tool.showDialog(actionsDialog);
} }