Skip to content

Commit f394bfb

Browse files
committed
Automatic merge of T1.5.1-1695-gade019506 and 17 pull requests
- Pull request #570 at f4a7495: glTF 2.0 support with PBR lighting - Pull request #900 at 4629736: DMI in 3D cab + two more dials - Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter - Pull request #1045 at cc4d53c: Bugfix: Empty Start Time for Explore, and other issues loading from Menu Selection and Content Routes - Pull request #1052 at 5bbc476: Content Manager: Add axle count, and lowest derail force - Pull request #1062 at de91cc4: Train Forces popup Window. - Pull request #1064 at 9b3415e: Add Train Info tab to Help window (F1) - Pull request #1066 at 62c89c1: Log derailment, using TraceInformation. - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1000 at d8d9709: Locomotive operation from control car - Pull request #1029 at 92c74ef: Superelevation Follow Up Fixes - Pull request #1057 at 50c3789: Switchable brake system - Pull request #1069 at 3f153f0: Mouse wheel control only with Alt – Followup for #1051 - Pull request #1070 at 9358e1c: Fix a NullReferenceException in TCS scripts - Pull request #1055 at 5c78967: Route Based TTrack Sounds - Pull request #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #1049 at 4dd8c4f: Re-organise document storage and access
19 parents facdb3d + ade0195 + f4a7495 + 4629736 + d3ae4a2 + cc4d53c + 5bbc476 + de91cc4 + 9b3415e + 62c89c1 + 1f5ba4c + d8d9709 + 92c74ef + 50c3789 + 3f153f0 + 9358e1c + 5c78967 + f1681df + 4dd8c4f commit f394bfb

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -675,12 +675,15 @@ SignalFeatures NextGenericSignalFeatures(string signalFunctionTypeName, int item
675675
if (head.Function == function)
676676
functionHead = head;
677677
signalTypeName = functionHead.SignalTypeName;
678-
foreach (var key in functionHead.signalType.DrawStates.Keys)
678+
if (functionHead?.signalType?.DrawStates != null)
679679
{
680-
if (functionHead.signalType.DrawStates[key].Index == functionHead.draw_state)
680+
foreach (var key in functionHead.signalType.DrawStates.Keys)
681681
{
682-
drawStateName = functionHead.signalType.DrawStates[key].Name;
683-
break;
682+
if (functionHead.signalType.DrawStates[key].Index == functionHead.draw_state)
683+
{
684+
drawStateName = functionHead.signalType.DrawStates[key].Name;
685+
break;
686+
}
684687
}
685688
}
686689
textAspect = functionHead?.TextSignalAspect ?? "";

0 commit comments

Comments
 (0)