From 252ec48a44e2c42e21136a52ce7a9915e9fe4ff2 Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Mon, 22 Mar 2021 15:35:45 -0400 Subject: [PATCH] GP-38 Corrected ContextAction failure to display dialog (Closes #2860) --- .../app/plugin/core/disassembler/DisassemblerPlugin.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/DisassemblerPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/DisassemblerPlugin.java index ce0e969af0..e97357118b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/DisassemblerPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/DisassemblerPlugin.java @@ -302,15 +302,12 @@ public class DisassemblerPlugin extends Plugin { } public void setDefaultContext(ListingActionContext context) { - Program contextProgram = context.getProgram(); Register baseContextReg = contextProgram.getLanguage().getContextBaseRegister(); if (baseContextReg != null && baseContextReg.hasChildren()) { - return; + tool.showDialog(new ProcessorStateDialog(contextProgram.getProgramContext()), + context.getComponentProvider()); } - - tool.showDialog(new ProcessorStateDialog(contextProgram.getProgramContext()), - context.getComponentProvider()); } public boolean hasContextRegisters(Program currentProgram) {