Merge pull request #909 from peternewell/control_car_bug

Correct Control Car crash bug
openrails · Jan 19, 2024 · b02a6e5 · b02a6e5
2 parents abb8eb9 + c3a572a
commit b02a6e5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs
@@ -41,7 +41,7 @@ namespace Orts.Simulation.RollingStocks
 {
     public class MSTSControlTrailerCar : MSTSLocomotive
     {
-        public int ControllerNumberOfGears = 1;
+        public int ControllerNumberOfGears = 0;
         bool HasGearController = false;
         bool ControlGearUp = false;
         bool ControlGearDown = false;
@@ -174,7 +174,7 @@ public override void Update(float elapsedClockSeconds)
                 {
                     var locog = car as MSTSDieselLocomotive;
 
-                    if (locog != null && car != this && !locog.IsLeadLocomotive() && (ControlGearDown || ControlGearUp))
+                    if (locog != null && locog.DieselEngines[0].GearBox != null && locog.DieselEngines[0].GearBox != null && car != this && !locog.IsLeadLocomotive() && (ControlGearDown || ControlGearUp))
                     {
                         if (ControlGearUp)
                         {
@@ -194,7 +194,7 @@ public override void Update(float elapsedClockSeconds)
                     }
 
                     // Read values for the HuD and other requirements, will be based upon the last motorcar
-                    if (locog != null)
+                    if (locog != null && locog.DieselEngines[0].GearBox != null && locog.DieselEngines[0].GearBox != null)
                     {
                         ControlGearIndex = locog.DieselEngines[0].GearBox.CurrentGearIndex;
                         ControlGearIndication = locog.DieselEngines[0].GearBox.GearIndication;