Fixed Some Crashes Related to Weird Vehicle Mod Rating Settings

chummer5a · Mar 6, 2024 · 8f47b2b · 8f47b2b
1 parent 60a7a37
commit 8f47b2b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/Chummer/Backend/Equipment/VehicleMod.cs b/Chummer/Backend/Equipment/VehicleMod.cs
@@ -204,7 +204,6 @@ private void ChildrenWeaponsOnCollectionChanged(object sender, NotifyCollectionC
             objXmlMod.TryGetStringFieldQuickly("category", ref _strCategory);
             objXmlMod.TryGetStringFieldQuickly("limit", ref _strLimit);
             objXmlMod.TryGetStringFieldQuickly("slots", ref _strSlots);
-            _intRating = intRating;
             _blnDowngrade = objXmlMod?["downgrade"] != null;
             if (!objXmlMod.TryGetMultiLineStringFieldQuickly("altnotes", ref _strNotes))
                 objXmlMod.TryGetMultiLineStringFieldQuickly("notes", ref _strNotes);
@@ -223,6 +222,10 @@ private void ChildrenWeaponsOnCollectionChanged(object sender, NotifyCollectionC
                     _strRatingLabel = "Label_Seats";
                     break;
             }
+            if (string.IsNullOrEmpty(_strMaxRating))
+                _intRating = 0;
+            else
+                _intRating = Math.Max(intRating, 1);
             objXmlMod.TryGetStringFieldQuickly("ratinglabel", ref _strRatingLabel);
             objXmlMod.TryGetInt32FieldQuickly("conditionmonitor", ref _intConditionMonitor);
             objXmlMod.TryGetStringFieldQuickly("weaponmountcategories", ref _strWeaponMountCategories);

diff --git a/Chummer/Forms/Character Forms/CharacterCreate.cs b/Chummer/Forms/Character Forms/CharacterCreate.cs
@@ -15487,9 +15487,9 @@ await cmdCyberwareChangeMount.DoThreadSafeAsync(x => x.Visible = false, token)
                                     if (intGearMinRatingValue > 0)
                                         x.Minimum = intGearMinRatingValue;
                                     else if (intGearMinRatingValue == 0 && objGear.Name.Contains("Credstick,"))
-                                        x.Minimum = 0;
+                                        x.Minimum = Math.Min(0, intGearMaxRatingValue);
                                     else
-                                        x.Minimum = 1;
+                                        x.Minimum = Math.Min(1, intGearMaxRatingValue);
                                     x.Maximum = intGearMaxRatingValue;
                                     x.Value = intRating;
                                     x.Enabled = x.Minimum != x.Maximum
@@ -17258,9 +17258,9 @@ await lblGearCategory
                                 if (intGearMinRatingValue > 0)
                                     x.Minimum = intGearMinRatingValue;
                                 else if (intGearMinRatingValue == 0 && objGear.Name.Contains("Credstick,"))
-                                    x.Minimum = 0;
+                                    x.Minimum = Math.Min(0, intGearMaxRatingValue);
                                 else
-                                    x.Minimum = 1;
+                                    x.Minimum = Math.Min(1, intGearMaxRatingValue);
                                 x.Maximum = intGearMaxRatingValue;
                                 x.Value = intRating;
                                 x.Enabled = x.Minimum != x.Maximum && string.IsNullOrEmpty(objGear.ParentID);
@@ -19106,7 +19106,7 @@ await lblVehicleRatingLabel.DoThreadSafeAsync(x => x.Visible = true, token)
                                     await nudVehicleRating.DoThreadSafeAsync(x =>
                                     {
                                         x.Maximum = intMaxRating;
-                                        x.Minimum = 1;
+                                        x.Minimum = Math.Min(1, intMaxRating);
                                         x.Visible = true;
                                         x.Value = objMod.Rating;
                                         x.Increment = 1;
@@ -19565,7 +19565,7 @@ await lblVehicleRatingLabel.DoThreadSafeAsync(x => x.Visible = true, token)
                                 await nudVehicleRating.DoThreadSafeAsync(x =>
                                 {
                                     x.Visible = true;
-                                    x.Minimum = 1;
+                                    x.Minimum = Math.Min(1, objAccessory.MaxRating);
                                     x.Maximum = objAccessory.MaxRating;
                                     x.Value = objAccessory.Rating;
                                     x.Increment = 1;