Skip to content

Commit 747c103

Browse files
committed
Automatic merge of T1.5.1-1689-g72674c98d and 15 pull requests
- 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 3b18c48: 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 389c2d2: Switchable brake system - Pull request #1065 at 409064d: Fix for PantographToggle sound event - Pull request #1068 at d6e1f83: Build for online-only documentation files - Pull request #1055 at 90bbcff: Route Based TTrack Sounds - Pull request #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
17 parents 47bb503 + 72674c9 + 4629736 + d3ae4a2 + cc4d53c + 5bbc476 + 3b18c48 + 9b3415e + 62c89c1 + 1f5ba4c + d8d9709 + 92c74ef + 389c2d2 + 409064d + d6e1f83 + 90bbcff + f1681df commit 747c103

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ public virtual void LoadFromWagFile(string wagFilePath)
650650
BrakeSystems.Remove(key);
651651
}
652652
BrakeModeNames = BrakeSystems.Keys.Select(k => k.BrakeMode.ToString()).Distinct().ToArray();
653-
BrakeSystem = BrakeSystem ?? MSTSBrakeSystem.Create(CarBrakeSystemType, this);
653+
BrakeSystem = BrakeSystemAlt = BrakeSystem ?? MSTSBrakeSystem.Create(CarBrakeSystemType, this);
654654

655655
BrakeSystem.InitialMaxBrakeForceN = ParsetimeBrakeForces.MaxBrakeForceN;
656656
BrakeSystem.InitialMaxHandbrakeForceN = ParsetimeBrakeForces.MaxHandbrakeForceN;
@@ -1110,7 +1110,7 @@ void HandleIncompatibleBrakesystems(BrakeSystem newBrakeSystem)
11101110
{
11111111
if (newBrakeSystem is VacuumSinglePipe ^ BrakeSystem is VacuumSinglePipe)
11121112
{
1113-
if (BrakeSystemAlt == null)
1113+
if (BrakeSystemAlt == null || BrakeSystemAlt == BrakeSystem)
11141114
{
11151115
BrakeSystemAlt = BrakeSystem.CreateNewLike(newBrakeSystem, this).InitializeDefault();
11161116

0 commit comments

Comments
 (0)