From deffc912a067b37b446f8865fe5532c73580d3ef Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Thu, 8 Apr 2021 10:38:42 -0400 Subject: [PATCH] GP-0 Corrected swing related issues affecting testing --- .../Base/src/main/java/ghidra/app/script/GhidraState.java | 5 ++++- .../java/ghidra/app/script/GhidraScriptAskMethodsTest.java | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraState.java b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraState.java index 2ec73d6898..32b7161418 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraState.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraState.java @@ -29,6 +29,7 @@ import ghidra.program.model.address.AddressSet; import ghidra.program.model.listing.Program; import ghidra.program.util.ProgramLocation; import ghidra.program.util.ProgramSelection; +import ghidra.util.Swing; import ghidra.util.SystemUtilities; /** @@ -64,7 +65,9 @@ public class GhidraState { this.currentHighlight = highlight; this.isGlobalState = true; if (!SystemUtilities.isInHeadlessMode()) { - gatherParamPanel = new GatherParamPanel(this); + Swing.runNow(() -> { + gatherParamPanel = new GatherParamPanel(this); + }); } } diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/script/GhidraScriptAskMethodsTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/script/GhidraScriptAskMethodsTest.java index 507a99625a..af8f7bc57b 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/script/GhidraScriptAskMethodsTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/script/GhidraScriptAskMethodsTest.java @@ -84,8 +84,10 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT } private void clearScriptCachedValues() { - Map map = (Map) TestUtils.getInstanceField("askMap", script); - map.clear(); + if (script != null) { + Map map = (Map) TestUtils.getInstanceField("askMap", script); + map.clear(); + } } @Test