Merge pull request #1090 from cesarBLG/null-check-tcs

cesarBLG · web-flow · commit 9d6ee3561394 · 2025-05-24T13:43:38.000+02:00
Add null check to avoid crash on corrupt signal files
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
@@ -673,6 +673,8 @@ SignalFeatures NextGenericSignalFeatures(string signalFunctionTypeName, int item
                     foreach (var head in trainSignal.SignalObject.SignalHeads)
                         if (head.Function == function)
                             functionHead = head;
+                    if (functionHead == null)
+                        goto Exit;
                     signalTypeName = functionHead.SignalTypeName;
                     if (functionHead?.signalType?.DrawStates != null)
                     {

Original file line number	Diff line number	Diff line change
`@@ -673,6 +673,8 @@ SignalFeatures NextGenericSignalFeatures(string signalFunctionTypeName, int item`
`673`	`673`	`foreach (var head in trainSignal.SignalObject.SignalHeads)`
`674`	`674`	`if (head.Function == function)`
`675`	`675`	`functionHead = head;`
	`676`	`+ if (functionHead == null)`
	`677`	`+ goto Exit;`
`676`	`678`	`signalTypeName = functionHead.SignalTypeName;`
`677`	`679`	`if (functionHead?.signalType?.DrawStates != null)`
`678`	`680`	`{`