From 0d0b61b59c80ff3514d92bcdab017cd643d8a892 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Wed, 10 Dec 2025 19:13:28 -0500
Subject: [PATCH] Fix for error messages when running tests

---
 .../Features/Base/src/main/java/ghidra/test/TestEnv.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/test/TestEnv.java b/Ghidra/Features/Base/src/main/java/ghidra/test/TestEnv.java
index b757e3fef6..e39c85eb8f 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/test/TestEnv.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/test/TestEnv.java
@@ -56,8 +56,7 @@ import ghidra.program.model.lang.*;
 import ghidra.program.model.listing.Program;
 import ghidra.program.util.DefaultLanguageService;
 import ghidra.program.util.ProgramUtilities;
-import ghidra.util.Msg;
-import ghidra.util.TaskUtilities;
+import ghidra.util.*;
 import ghidra.util.datastruct.WeakSet;
 import ghidra.util.exception.*;
 import ghidra.util.task.*;
@@ -1103,8 +1102,10 @@ public class TestEnv {
 	}
 
 	private void resetTheme() {
-		ThemeManager themeManager = ThemeManager.getInstance();
-		themeManager.restoreThemeValues();
+		Swing.runNow(() -> {
+			ThemeManager themeManager = ThemeManager.getInstance();
+			themeManager.restoreThemeValues();
+		});
 	}
 
 	private void deleteTestProject(String projectName) {