From ad21eba9f758c6fc95b1aaa3393e887e39546d28 Mon Sep 17 00:00:00 2001
From: Kenneth VanderLinde <kwvanderlinde@gmail.com>
Date: Thu, 10 Aug 2023 10:32:55 -0700
Subject: [PATCH] Ensure MacroEditorDialog.callback is not null

---
 .../client/ui/macrobuttons/dialog/MacroEditorDialog.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/rptools/maptool/client/ui/macrobuttons/dialog/MacroEditorDialog.java b/src/main/java/net/rptools/maptool/client/ui/macrobuttons/dialog/MacroEditorDialog.java
index e8ee80cc03..251aa68a71 100644
--- a/src/main/java/net/rptools/maptool/client/ui/macrobuttons/dialog/MacroEditorDialog.java
+++ b/src/main/java/net/rptools/maptool/client/ui/macrobuttons/dialog/MacroEditorDialog.java
@@ -111,7 +111,7 @@ public class MacroEditorDialog extends JDialog implements SearchListener {
    * @return the MacroEditorDialog.
    */
   public static MacroEditorDialog createMacroButtonDialog() {
-    return new MacroEditorDialog(false, true, null);
+    return new MacroEditorDialog(false, true, s -> {});
   }
 
   /**
@@ -127,7 +127,8 @@ public static MacroEditorDialog createModalDialog(@Nonnull Consumer<String> call
     return new MacroEditorDialog(true, false, callback);
   }
 
-  private MacroEditorDialog(boolean isModal, boolean isMacroButton, Consumer<String> callback) {
+  private MacroEditorDialog(
+      boolean isModal, boolean isMacroButton, @Nonnull Consumer<String> callback) {
     super(MapTool.getFrame(), "", true);
     if (!isModal) {
       this.setModalityType(ModalityType.MODELESS);
@@ -740,9 +741,7 @@ protected void executeAction() {
 
   private void save(boolean closeDialog) {
     if (button == null) {
-      if (callback != null) {
-        callback.accept(getCommandTextArea().getText());
-      }
+      callback.accept(getCommandTextArea().getText());
     } else {
       String hotKey = getHotKeyCombo().getSelectedItem().toString();
       button.getHotKeyManager().assignKeyStroke(hotKey);