mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4527_d-millar_traceRMI_dialog_improv'

Browse Source
This commit is contained in:
Ryan Kurtz
2024-04-19 08:41:18 -04:00
parent 0f23e035b6 73d656d6b1
commit 30f1cec696
4 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/control/DebuggerMethodActionsPlugin.java
View File

@@ -135,7 +135,8 @@ public class DebuggerMethodActionsPlugin extends Plugin implements PopupActionPr
List<DockingActionIf> result = new ArrayList<>();
for (ActionEntry entry : target.collectActions(null, context).values()) {
if (entry.requiresPrompt() || entry.builtIn()) {
//if (entry.requiresPrompt() || entry.builtIn()) {
if (!entry.isEnabled() || entry.builtIn()) {
continue;
}
result.add(new InvokeActionEntryAction(entry));

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/control/TargetActionTask.java
View File

@@ -166,7 +166,7 @@ public class TargetActionTask extends Task {
@Override
public void run(TaskMonitor monitor) throws CancelledException {
try {
entry.run(false);
entry.run(entry.requiresPrompt());
}
catch (Throwable e) {
reportError(e);