8000 Fix: #7007 Fixed Cancel Deployment Producing Scenario with 0 BV Budget by IllianiBird · Pull Request #7009 · MegaMek/mekhq · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix: #7007 Fixed Cancel Deployment Producing Scenario with 0 BV Budget #7009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2025
Merged

Fix: #7007 Fixed Cancel Deployment Producing Scenario with 0 BV Budget #7009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion MekHQ/src/mekhq/gui/StratconPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,8 +1098,12 @@ public void actionPerformed(ActionEvent evt) {
scenarioWizard.toFront();
scenarioWizard.setVisible(true);
}
if (selectedScenario != null && !isCommitForces()) {
if (selectedScenario != null && scenarioWizard.isWasCanceled()) {
logger.info("Scenario wizard was cancelled. Resetting scenario to default state.");
selectedScenario.resetScenario(campaign);

// We currently retain the wizard in memory, so need to make sure we reset the canceled state
scenarioWizard.setWasCanceled(false);
}

setCommitForces(false);
Expand Down
20 changes: 19 additions & 1 deletion MekHQ/src/mekhq/gui/stratcon/StratconScenarioWizard.java