From dade254138c8a0a5c065c999557ffec2d910b1cb Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Tue, 8 Sep 2026 12:10:15 -0400
Subject: [PATCH] Test fixes

---
 .../docking/widgets/tree/tasks/GTreeStartEditingTask.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/tasks/GTreeStartEditingTask.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/tasks/GTreeStartEditingTask.java
index 0512f3f131..c85a5f5594 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/tasks/GTreeStartEditingTask.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/tasks/GTreeStartEditingTask.java
@@ -104,6 +104,10 @@ public class GTreeStartEditingTask extends GTreeTask {
 
 		@Override
 		public void treeNodesInserted(TreeModelEvent e) {
+			if (newName == null) {
+				return; // editing cancelled
+			}
+
 			Object[] children = e.getChildren();
 			for (Object object : children) {
 				GTreeNode node = (GTreeNode) object;