Skip to content

Commit 03d3d6d

Browse files
committed
Automatic merge of T1.6-rc2-41-gacd714487 and 10 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at c2b1963: Automatic speed control - Pull request #1107 at f5eb3dc: Fix DPMode when last remote is moved to front. - Pull request #1108 at 343c792: Fix Horn, Bell, and MU light conditions on AI trains - Pull request #1109 at 0190043: Fix Erroneous Detection of Departure Before Passenger Boarding Completed - Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception - Pull request #1112 at 1224807: update for V1.6 - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1104 at f40920a: Handle simple adhesion within the axle module - Pull request #1081 at 689494b: Brake cuts power unification
12 parents 49dc468 + acd7144 + e10390b + c2b1963 + f5eb3dc + 343c792 + 0190043 + 387388e + 1224807 + 5845a1a + f40920a + 689494b commit 03d3d6d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,7 @@ public void SpeedSelectorIncreaseStep()
11981198
if (time >= selectedSpeedLeverHoldTime && time < selectedSpeedLeverHoldTime + SpeedSelectorStepTimeSeconds) return;
11991199
selectedSpeedLeverHoldTime = time;
12001200

1201-
if (SpeedSelectorIsDiscrete)
1201+
if (SpeedSelectorController.NotchCount() > 0)
12021202
{
12031203
SpeedSelectorController.StartIncrease();
12041204
SpeedSelectorController.StopIncrease();
@@ -1222,7 +1222,7 @@ public void SpeedSelectorDecreaseStep()
12221222
selectedSpeedLeverHoldTime = time;
12231223

12241224
float speed = ControllerValueToSelectedSpeedMpS(SpeedSelectorController.CurrentValue) - SpeedRegulatorNominalSpeedStepMpS;
1225-
if (SpeedSelectorIsDiscrete)
1225+
if (SpeedSelectorController.NotchCount() > 0)
12261226
{
12271227
SpeedSelectorController.StartDecrease();
12281228
SpeedSelectorController.StopDecrease();

0 commit comments

Comments
 (0)