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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2025-07-02 12:55:50 -04:00
commit 5dcd35ca6f
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Ghidra/Features/Base/src/main/java/ghidra/program/flatapi/FlatProgramAPI.java
View file

@ -207,6 +207,7 @@ public class FlatProgramAPI {
AutoAnalysisManager mgr = AutoAnalysisManager.getAnalysisManager(program); AutoAnalysisManager mgr = AutoAnalysisManager.getAnalysisManager(program);
mgr.initializeOptions();
mgr.reAnalyzeAll(null); mgr.reAnalyzeAll(null);
analyzeChanges(program); analyzeChanges(program);

6
Ghidra/Framework/Docking/src/main/java/docking/GlobalMenuAndToolBarManager.java
View file

@ -212,8 +212,12 @@ public class GlobalMenuAndToolBarManager implements DockingWindowListener {
KeyboardFocusManager kfm = KeyboardFocusManager.getCurrentKeyboardFocusManager(); KeyboardFocusManager kfm = KeyboardFocusManager.getCurrentKeyboardFocusManager();
Window w = kfm.getFocusedWindow(); Window w = kfm.getFocusedWindow();
if (w instanceof DockingDialog dialog) { 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(); DialogComponentProvider provider = dialog.getDialogComponent();
return provider.getActionContext(null); if (provider != null) {
return provider.getActionContext(null);
}
} }
return getComponentProviderContext(focusedWindowNode); return getComponentProviderContext(focusedWindowNode);