Merge pull request #6020 from psikomonkie/issue-6018-cancel-reinforce…

…ments-resets-deployment Issue 6018: Manage Scenario will now use manage scenario and not manage forces
MegaMek · Feb 10, 2025 · 911c9e4 · 911c9e4
2 parents 8647433 + 0e7f2ce
commit 911c9e4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/MekHQ/src/mekhq/gui/StratconPanel.java b/MekHQ/src/mekhq/gui/StratconPanel.java
@@ -192,11 +192,12 @@ private void buildRightClickMenu(StratconCoords coords) {
 
                 if (scenario.getCurrentState().equals(UNRESOLVED)) {
                     menuItemManageScenario.setText("Manage Deployment");
+                    menuItemManageScenario.setActionCommand(RCLICK_COMMAND_MANAGE_FORCES);
                 } else {
                     menuItemManageScenario.setText("Manage Reinforcements");
+                    menuItemManageScenario.setActionCommand(RCLICK_COMMAND_MANAGE_SCENARIO);
                 }
 
-                menuItemManageScenario.setActionCommand(RCLICK_COMMAND_MANAGE_FORCES);
                 menuItemManageScenario.addActionListener(this);
                 rightClickMenu.add(menuItemManageScenario);
             }
@@ -1077,7 +1078,7 @@ public void actionPerformed(ActionEvent evt) {
                 if (selectedScenario != null
                     && selectedScenario.getCurrentState() == PRIMARY_FORCES_COMMITTED) {
                     scenarioWizard.setCurrentScenario(currentTrack.getScenario(selectedCoords),
-                        currentTrack, campaignState, isPrimaryForce);
+                        currentTrack, campaignState, false);
 
                     scenarioWizard.toFront();
                     scenarioWizard.setVisible(true);