Merge pull request #1070 from pzgulyas/scriptfix

cjakeman · web-flow · commit 4fdacd539051 · 2025-05-04T15:49:56.000+01:00
Fix a NullReferenceException in TCS scripts
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
@@ -674,12 +674,15 @@ SignalFeatures NextGenericSignalFeatures(string signalFunctionTypeName, int item
                         if (head.Function == function)
                             functionHead = head;
                     signalTypeName = functionHead.SignalTypeName;
-                    foreach (var key in functionHead.signalType.DrawStates.Keys)
+                    if (functionHead?.signalType?.DrawStates != null)
                     {
-                        if (functionHead.signalType.DrawStates[key].Index == functionHead.draw_state)
+                        foreach (var key in functionHead.signalType.DrawStates.Keys)
                         {
-                            drawStateName = functionHead.signalType.DrawStates[key].Name;
-                            break;
+                            if (functionHead.signalType.DrawStates[key].Index == functionHead.draw_state)
+                            {
+                                drawStateName = functionHead.signalType.DrawStates[key].Name;
+                                break;
+                            }
                         }
                     }
                     textAspect = functionHead?.TextSignalAspect ?? "";

Original file line number	Diff line number	Diff line change
`@@ -674,12 +674,15 @@ SignalFeatures NextGenericSignalFeatures(string signalFunctionTypeName, int item`
`674`	`674`	`if (head.Function == function)`
`675`	`675`	`functionHead = head;`
`676`	`676`	`signalTypeName = functionHead.SignalTypeName;`
`677`		`- foreach (var key in functionHead.signalType.DrawStates.Keys)`
	`677`	`+ if (functionHead?.signalType?.DrawStates != null)`
`678`	`678`	`{`
`679`		`- if (functionHead.signalType.DrawStates[key].Index == functionHead.draw_state)`
	`679`	`+ foreach (var key in functionHead.signalType.DrawStates.Keys)`
`680`	`680`	`{`
`681`		`- drawStateName = functionHead.signalType.DrawStates[key].Name;`
`682`		`- break;`
	`681`	`+ if (functionHead.signalType.DrawStates[key].Index == functionHead.draw_state)`
	`682`	`+ {`
	`683`	`+ drawStateName = functionHead.signalType.DrawStates[key].Name;`
	`684`	`+ break;`
	`685`	`+ }`
`683`	`686`	`}`
`684`	`687`	`}`
`685`	`688`	`textAspect = functionHead?.TextSignalAspect ?? "";`