Add check to prevent crashes when signal scripts use a bad draw state

openrails · Aug 11, 2022 · 223aae6 · 223aae6
1 parent 2ffcf48
commit 223aae6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
@@ -660,7 +660,7 @@ SignalFeatures NextGenericSignalFeatures(string signalFunctionTypeName, int item
 
                 var functionHead = trainSignal.SignalObject.SignalHeads.Find(head => head.ORTSsigFunctionIndex == fn_type);
                 signalTypeName = functionHead.SignalTypeName;
-                if (functionHead.draw_state >= 0)
+                if (functionHead.signalType.DrawStates.Any(d => d.Value.Index == functionHead.draw_state))
                 {
                     drawStateName = functionHead.signalType.DrawStates.First(d => d.Value.Index == functionHead.draw_state).Value.Name;
                 }