Merge pull request #5270 from DM0000/NullContractValuesFix

Null checks in manual contract generation
MegaMek · Dec 2, 2024 · de87aeb · de87aeb
2 parents 2301f16 + d333f62
commit de87aeb
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/MekHQ/src/mekhq/gui/dialog/NewAtBContractDialog.java b/MekHQ/src/mekhq/gui/dialog/NewAtBContractDialog.java
@@ -509,10 +509,27 @@ protected void updatePaymentMultiplier() {
 
     @Override
     protected void btnOKActionPerformed(ActionEvent evt) {
+
         if (!btnOK.equals(evt.getSource())) {
             return;
         }
 
+        if (getCurrentEmployerCode() == null) {
+            JOptionPane.showMessageDialog(rootPane, "Make sure you set Employer!",
+                    "Contract is Missing Field", JOptionPane.WARNING_MESSAGE);
+            return;
+        }
+        if (getCurrentEnemyCode() == null) {
+            JOptionPane.showMessageDialog(rootPane, "Make sure you set Enemy!",
+                    "Contract is Missing Field", JOptionPane.WARNING_MESSAGE);
+            return;
+        }
+        if (cbPlanets.getSelectedItem() == null) {
+            JOptionPane.showMessageDialog(rootPane, "Make sure you set the Planet!",
+                    "Contract is Missing Field", JOptionPane.WARNING_MESSAGE);
+            return;
+        }
+
         AtBContract contract = (AtBContract) this.contract;
 
         contract.setName(txtName.getText());