Merge pull request #3943 from IllianiCBT/Nag_UnmaintainedSalvage

Unmaintained Unit Nag Dialog Suppressed for Units set to Salvage
MegaMek · Apr 6, 2024 · 54ec53e · 54ec53e
2 parents e3ac419 + bf3cc5f
commit 54ec53e
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/MekHQ/src/mekhq/gui/dialog/nagDialogs/UnmaintainedUnitsNagDialog.java b/MekHQ/src/mekhq/gui/dialog/nagDialogs/UnmaintainedUnitsNagDialog.java
@@ -27,6 +27,15 @@
 import javax.swing.*;
 
 public class UnmaintainedUnitsNagDialog extends AbstractMHQNagDialog {
+    private boolean checkHanger() {
+        for (Unit u : getCampaign().getHangar().getUnits()) {
+            if((u.isUnmaintained()) && (!u.isSalvage())) {
+                    return true;
+            }
+        }
+        return false;
+    }
+
     //region Constructors
     public UnmaintainedUnitsNagDialog(final JFrame frame, final Campaign campaign) {
         super(frame, "UnmaintainedUnitsNagDialog", "UnmaintainedUnitsNagDialog.title",
@@ -37,6 +46,6 @@ public UnmaintainedUnitsNagDialog(final JFrame frame, final Campaign campaign) {
     @Override
     protected boolean checkNag() {
         return !MekHQ.getMHQOptions().getNagDialogIgnore(getKey())
-                && getCampaign().getHangar().getUnitsStream().anyMatch(Unit::isUnmaintained);
+                && checkHanger();
     }
 }