Skip to content

Commit 896573d

Browse files
authored
Merge pull request #755 from Csantucci/throttle-air-combined-control-fix
Bug fix for https://bugs.launchpad.net/or/+bug/1999330 Crash with a throttle-air combined control
2 parents 9dc7237 + f79c1e2 commit 896573d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3951,7 +3951,7 @@ public void SetCombinedHandleValue(float value)
39513951
else if (CombinedControlType == CombinedControl.ThrottleAir && canBrake && value > CombinedControlSplitPosition)
39523952
SetTrainBrakeValue((MathHelper.Clamp(value, CombinedControlSplitPosition, 1) - CombinedControlSplitPosition) / (1 - CombinedControlSplitPosition));
39533953
else if (DynamicBrakePercent < 0 || TrainControlSystem.FullDynamicBrakingOrder ||
3954-
(!CruiseControl.DynamicBrakePriority && CruiseControl.SpeedRegMode == CruiseControl.SpeedRegulatorMode.Auto))
3954+
(CruiseControl != null && !CruiseControl.DynamicBrakePriority && CruiseControl.SpeedRegMode == CruiseControl.SpeedRegulatorMode.Auto))
39553955
SetThrottleValue(1 - MathHelper.Clamp(value, 0, CombinedControlSplitPosition) / CombinedControlSplitPosition);
39563956
}
39573957
}

0 commit comments

Comments
 (0)