formatting and checkLinkedScenario fixes

MegaMek · Jan 31, 2025 · 3d1cc68 · 3d1cc68
1 parent 32241f6
commit 3d1cc68
Show file tree

Hide file tree

Showing 4 changed files with 555 additions and 409 deletions.
diff --git a/MekHQ/src/mekhq/campaign/Campaign.java b/MekHQ/src/mekhq/campaign/Campaign.java
@@ -9152,7 +9152,8 @@ public ImageIcon getCampaignFactionIcon() {
      */
     public boolean checkLinkedScenario(int scenarioID) {
         for (Scenario scenario : getScenarios()) {
-            if (scenario.getId() == scenarioID  && getScenario(scenario.getId())) {
+            if ((scenario.getLinkedScenario() == scenarioID)  
+                && (getScenario(scenario.getId()).getStatus().isCurrent())) {
                 return true;
             }
         }