Merge pull request #5104 from IllianiCBT/presetPicker

Fixed Preset Picker Date Issues
MegaMek · Oct 21, 2024 · 500a75c · 500a75c
2 parents c331749 + 594b93f
commit 500a75c
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java b/MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java
@@ -320,17 +320,24 @@ public Campaign doInBackground() throws Exception {
                 if ((preset != null) && (preset.getGameOptions() != null)) {
                     campaign.setGameOptions(preset.getGameOptions());
                 }
-                campaign.setLocalDate(dc.getDate());
-                campaign.getGameOptions().getOption(OptionsConstants.ALLOWED_YEAR).setValue(campaign.getGameYear());
-                campaign.setStartingSystem((preset == null) ? null : preset.getPlanet());
 
                 // This must be after the date chooser to enable correct functionality.
                 setVisible(false);
 
                 // Campaign Options
                 if (isSelect && preset != null) {
                     preset.applyContinuousToCampaign(campaign);
+
+                    // This needs to be after we've applied the preset
+                    campaign.setLocalDate(dc.getDate());
+                    campaign.getGameOptions().getOption(OptionsConstants.ALLOWED_YEAR).setValue(campaign.getGameYear());
+                    campaign.setStartingSystem(preset.getPlanet());
                 } else {
+                    // This needs to be before we trigger the customize preset dialog
+                    campaign.setLocalDate(dc.getDate());
+                    campaign.getGameOptions().getOption(OptionsConstants.ALLOWED_YEAR).setValue(campaign.getGameYear());
+                    campaign.setStartingSystem((preset == null) ? null : preset.getPlanet());
+
                     CampaignOptionsDialog optionsDialog = new CampaignOptionsDialog(dialog, getFrame(), campaign, true);
                     optionsDialog.setLocationRelativeTo(getFrame());
                     optionsDialog.applyPreset(preset);