Handle null active locomotive

cesarBLG · cesarBLG · commit dc286f5551c6 · 2025-07-03T18:54:05.000+02:00
diff --git a/Source/Orts.Simulation/Common/Scripting/PowerSupply/ControlCarPowerSupply.cs b/Source/Orts.Simulation/Common/Scripting/PowerSupply/ControlCarPowerSupply.cs
@@ -51,11 +51,11 @@ protected override void SetCurrentElectricTrainSupplyState(PowerSupplyState stat
         protected override void SetCurrentDynamicBrakeAvailability(bool avail) {}
         public void SignalEventToControlActiveLocomotive(PowerSupplyEvent evt)
         {
-            ControlActiveLocomotive.LocomotivePowerSupply.HandleEvent(evt);
+            ControlActiveLocomotive?.LocomotivePowerSupply.HandleEvent(evt);
         }
         public void SignalEventToControlActiveLocomotive(PowerSupplyEvent evt, int id)
         {
-            ControlActiveLocomotive.LocomotivePowerSupply.HandleEvent(evt, id);
+            ControlActiveLocomotive?.LocomotivePowerSupply.HandleEvent(evt, id);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,11 @@ protected override void SetCurrentElectricTrainSupplyState(PowerSupplyState stat`
`51`	`51`	`protected override void SetCurrentDynamicBrakeAvailability(bool avail) {}`
`52`	`52`	`public void SignalEventToControlActiveLocomotive(PowerSupplyEvent evt)`
`53`	`53`	`{`
`54`		`- ControlActiveLocomotive.LocomotivePowerSupply.HandleEvent(evt);`
	`54`	`+ ControlActiveLocomotive?.LocomotivePowerSupply.HandleEvent(evt);`
`55`	`55`	`}`
`56`	`56`	`public void SignalEventToControlActiveLocomotive(PowerSupplyEvent evt, int id)`
`57`	`57`	`{`
`58`		`- ControlActiveLocomotive.LocomotivePowerSupply.HandleEvent(evt, id);`
	`58`	`+ ControlActiveLocomotive?.LocomotivePowerSupply.HandleEvent(evt, id);`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`