Skip to content

Commit e792528

Browse files
authored
Merge pull request #8248 from IllianiBird/salvageSoftlockRoundTwo
Fix #8246: Fixed Incorrect Use of `Equals` Instead of `Compare` in Salvage Picker Dialog
2 parents d08196e + dfe63ec commit e792528

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

MekHQ/src/mekhq/gui/dialog/camOpsSalvage/SalvagePostScenarioPicker.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ private void updateConfirmButtonState(List<SalvageComboBoxGroup> salvageComboBox
846846
if (currentPercent.compareTo(BigDecimal.valueOf(salvagePercent)) > 0 && !isExchangeRights) {
847847
disableConfirmAndColorName(confirmButton, unitSalvageLabel);
848848
// If we've gone over our %, we only block progression if the player is trying to salvage even more.
849-
shouldEnable = !unitSalvageMoneyCurrent.equals(unitSalvageMoneyInitial);
849+
shouldEnable = unitSalvageMoneyCurrent.compareTo(unitSalvageMoneyInitial) <= 0;
850850
}
851851
}
852852

@@ -1244,7 +1244,7 @@ private void syncMembershipForGroup(SalvageComboBoxGroup group, boolean isValid)
12441244

12451245
// Enforce mutual exclusivity (don’t allow both)
12461246
if (group.claimedSalvageForSale.isSelected() && group.claimedSalvageForKeeps.isSelected()) {
1247-
// Prefer the most recently toggled? We can keep simple: if sale is checked, uncheck keeps.
1247+
// Sale takes priority over keeps
12481248
group.claimedSalvageForKeeps.setSelected(false);
12491249
}
12501250

@@ -1282,9 +1282,9 @@ private void showUnit(TestUnit unit) {
12821282
/**
12831283
* Fixes the width of a combo box to prevent resizing when items are added or selected.
12841284
*
1285-
* <p>This method sets the preferred, minimum, and maximum sizes of the combo box to a fixed
1286-
* width while preserving the component's preferred height. This prevents the combo box from
1287-
* resizing dynamically based on its content, providing a consistent user interface.</p>
1285+
* <p>This method sets the preferred, minimum, and maximum sizes of the combo box to a fixed width while
1286+
* preserving the component's preferred height. This prevents the combo box from resizing dynamically based on its
1287+
* content, providing a consistent user interface.</p>
12881288
*
12891289
* @param combo the {@link JComboBox} to fix the width of
12901290
*

0 commit comments

Comments
 (0)