From 030fad284da7418fcd429fe2b9fb9ad2955ff517 Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Tue, 8 Aug 2023 08:37:19 -0400
Subject: [PATCH] GP-3718: Fix NPE when assigning watch types with no trace.

---
 .../plugin/core/debug/gui/watch/DebuggerWatchesProvider.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProvider.java
index 0024e5ec39..01c7b4652a 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProvider.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProvider.java
@@ -280,6 +280,9 @@ public class DebuggerWatchesProvider extends ComponentProviderAdapter
 			if (dataType == null) {
 				return null;
 			}
+			if (currentTrace == null) {
+				return dataType;
+			}
 			try (Transaction tx = currentTrace.openTransaction("Resolve DataType")) {
 				return currentTrace.getDataTypeManager().resolve(dataType, null);
 			}