Merge pull request #4239 from kwvanderlinde/bugfix/4238-npe-MacroEdit…

…orDialog-cancel Ensure MacroEditorDialog.callback is not null
RPTools · Aug 14, 2023 · 2229ec5 · 2229ec5
2 parents b570021 + ad21eba
commit 2229ec5
Showing 1 changed file with 4 additions and 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
@@ -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);