Check that editorWindow is nonnull before trying to use it.

vassalengine · Sep 13, 2023 · 5b41781 · 5b41781
1 parent 953c5f0
commit 5b41781
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/vassal-app/src/main/java/VASSAL/configure/ConfigureTree.java b/vassal-app/src/main/java/VASSAL/configure/ConfigureTree.java
@@ -625,17 +625,21 @@ private List<DefaultMutableTreeNode> getSearchNodes(DefaultMutableTreeNode root)
 
 
   private void notifyUpdate(final Configurable target) {
-    if (target instanceof AbstractConfigurable) {
-      if (editorWindow.getListKeyCommands() != null) {
-        editorWindow.getListKeyCommands().updateConfigurable((AbstractConfigurable)target);
+    if (editorWindow != null) {
+      if (target instanceof AbstractConfigurable) {
+        if (editorWindow.getListKeyCommands() != null) {
+          editorWindow.getListKeyCommands().updateConfigurable((AbstractConfigurable)target);
+        }
       }
     }
   }
 
   private void notifyDelete(final Configurable target) {
-    if (target instanceof AbstractConfigurable) {
-      if (editorWindow.getListKeyCommands() != null) {
-        editorWindow.getListKeyCommands().deleteConfigurable((AbstractConfigurable)target);
+    if (editorWindow != null) {
+      if (target instanceof AbstractConfigurable) {
+        if (editorWindow.getListKeyCommands() != null) {
+          editorWindow.getListKeyCommands().deleteConfigurable((AbstractConfigurable)target);
+        }
       }
     }
   }