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/GP-1-dragonmacher-action-context-fix'

Browse source
This commit is contained in:
Ryan Kurtz 2025-07-29 09:44:57 -04:00
commit 7fb7f5df1b
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Framework/Docking/src/main/java/docking/WindowActionManager.java
View file

@ -116,6 +116,7 @@ public class WindowActionManager {
void contextChanged(Map<Class<? extends ActionContext>, ActionContext> defaultContextMap,
ActionContext localContext, Set<DockingActionIf> excluded) {
/**
* We need the guard against reentrant changes to the actionToProxyMap, lest the iterator
* throw a ConcurrentModificationException. If the guard finds a violation, i.e., the map
@ -145,8 +146,8 @@ public class WindowActionManager {
ActionContext context =
getContextForAction(action, localContext, defaultContextMap);
// Reentry point 2
boolean enabled =
context == null ? false : proxyAction.isEnabledForContext(context);
boolean enabled = proxyAction.isEnabledForContext(context);
// Reentry point 3, which we check
proxyAction.setEnabled(enabled);
if (reentryGuard.isViolated()) {
@ -168,7 +169,7 @@ public class WindowActionManager {
return context;
}
}
return null;
return new DefaultActionContext();
}
/**