Don't show safety prompt twice when resetting new unit

MegaMek · Jan 11, 2025 · 3062c09 · 3062c09
1 parent 6561f8e
commit 3062c09
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/megameklab/src/megameklab/ui/MenuBar.java b/megameklab/src/megameklab/ui/MenuBar.java
@@ -157,7 +157,7 @@ private JMenu createFileMenu() {
         final JMenuItem miResetCurrentUnit = new JMenuItem(resources.getString("miResetCurrentUnit.text"));
         miResetCurrentUnit.setName("miResetCurrentUnit");
         miResetCurrentUnit.setMnemonic(KeyEvent.VK_R);
-        miResetCurrentUnit.addActionListener(this::resetEntity);
+        miResetCurrentUnit.addActionListener(event -> resetEntity(false));
         miResetCurrentUnit.setEnabled(isUnitGui());
         fileMenu.add(miResetCurrentUnit);
 
@@ -1084,8 +1084,8 @@ private void recordSheetImagesAction() {
         dlg.setVisible(true);
     }
 
-    private void resetEntity(ActionEvent event) {
-        if (!owner.safetyPrompt() || !isUnitGui()) {
+    private void resetEntity(boolean skipSafetyPrompt) {
+        if (skipSafetyPrompt || !owner.safetyPrompt() || !isUnitGui()) {
             return;
         }
 
@@ -1130,13 +1130,13 @@ public void dropChanges() {
 
         var filename = editor.getFileName();
         if (filename == null || filename.isBlank()) {
-            resetEntity(null);
+            resetEntity( true);
             return;
         }
 
         var file = new File(filename);
         if (!file.isFile()) {
-            resetEntity(null);
+            logger.error("Could not discard changed to unit because the original file no longer exists!", "Reset error");
         } else {
             try {
                 var entity = new MekFileParser(file).getEntity();