Skip to content

Commit bbc16aa

Browse files
committed
Automatic merge of T1.5.1-1741-gf80cfb5d1 and 20 pull requests
- Pull request #570 at f11a428: glTF 2.0 support with PBR lighting - Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter - Pull request #1052 at 3b5cb90: Content Manager: Add axle count, and lowest derail force - Pull request #1062 at bbc0013: Train Forces popup Window. - Pull request #1064 at cb510d6: Add Train Info tab to Help window (F1) - Pull request #1066 at 62c89c1: Log derailment, using TraceInformation. - Pull request #1082 at a3128ae: Allow variable water level in glass gauge - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1049 at 6a0c471: Re-organise document storage and access - Pull request #1057 at 84592f7: Switchable brake system - Pull request #1069 at 99fc9ac: Mouse wheel control only with Alt – Followup for #1051 - Pull request #1070 at f818e40: Fix a NullReferenceException in TCS scripts - Pull request #1071 at 722dd3f: Change cover image for v1.6 - Pull request #1074 at e9a66c1: Gradient - commit 2024-16-12 - Pull request #1076 at 3bbd537: Allow depart early - Pull request #1077 at 7e73abd: Fix SME brakes not working - Pull request #1078 at 9ab642e: Default PowerSupply script for steam locomotives - Pull request #1079 at 5e37059: Adds Polish transations - Pull request #1080 at a637cb8: arranges Options > System tab for longer texts - Pull request #1081 at 689494b: Brake cuts power unification
22 parents 6ceaf48 + f80cfb5 + f11a428 + d3ae4a2 + 3b5cb90 + bbc0013 + cb510d6 + 62c89c1 + a3128ae + 1f5ba4c + 6a0c471 + 84592f7 + 99fc9ac + f818e40 + 722dd3f + e9a66c1 + 3bbd537 + 7e73abd + 9ab642e + 5e37059 + a637cb8 + 689494b commit bbc16aa

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3568,7 +3568,7 @@ public bool BuildStopInfo(TTTrain actTrain, int actPlatformID, Signals signalRef
35683568
}
35693569

35703570
// Stop used to define command only - find related section in route
3571-
else if (Commands != null)
3571+
else if (Commands != null && !passTime.HasValue)
35723572
{
35733573
// Get platform details
35743574
int platformIndex;

0 commit comments

Comments
 (0)