From 044bd03ccb847e2ab0bc1fd3f48733f0a4f3f8be Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Tue, 1 Jul 2025 17:57:15 +0000
Subject: [PATCH] GP-5790: Fix NPE on "Select Current Module" when cursor is
 not in a module.

---
 .../core/debug/gui/modules/DebuggerModulesProvider.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/modules/DebuggerModulesProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/modules/DebuggerModulesProvider.java
index 8940f79a9f..1481bca4ed 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/modules/DebuggerModulesProvider.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/modules/DebuggerModulesProvider.java
@@ -1113,6 +1113,10 @@ public class DebuggerModulesProvider extends ComponentProviderAdapter
 				}
 				bestModule = module;
 			}
+			if (bestModule == null) {
+				setSelectedModules(Set.of());
+				return;
+			}
 			if (bestModule.getSections(snap).isEmpty()) {
 				setSelectedModules(Set.of(bestModule));
 				return;