Skip to content

Commit 650b314

Browse files
committed
Automatic merge of T1.6-rc3-30-gdf7bf1a26 and 10 pull requests
- Pull request #1104 at c039a26: Handle simple adhesion within the axle module - Pull request #1057 at 1c2bcb4: Switchable brake system - Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2391bc0: Automatic speed control - Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1123 at dc286f5: Handle null control active locomotive - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification
12 parents 3598380 + df7bf1a + c039a26 + 1c2bcb4 + e10390b + 2391bc0 + 387388e + 270f22f + 91d2d26 + dc286f5 + 5845a1a + 689494b commit 650b314

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Source/Orts.Simulation/Common/Scripting/PowerSupply/ControlCarPowerSupply.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ protected override void SetCurrentElectricTrainSupplyState(PowerSupplyState stat
5151
protected override void SetCurrentDynamicBrakeAvailability(bool avail) {}
5252
public void SignalEventToControlActiveLocomotive(PowerSupplyEvent evt)
5353
{
54-
ControlActiveLocomotive.LocomotivePowerSupply.HandleEvent(evt);
54+
ControlActiveLocomotive?.LocomotivePowerSupply.HandleEvent(evt);
5555
}
5656
public void SignalEventToControlActiveLocomotive(PowerSupplyEvent evt, int id)
5757
{
58-
ControlActiveLocomotive.LocomotivePowerSupply.HandleEvent(evt, id);
58+
ControlActiveLocomotive?.LocomotivePowerSupply.HandleEvent(evt, id);
5959
}
6060
}
6161
}

0 commit comments

Comments
 (0)