Automatic merge of T1.4-202-gc21e8aeca and 20 pull requests

openrails-bot · openrails-bot · commit 4fe6b710717a · 2022-02-10T15:21:33.000Z
- Pull request #525 at 614b222: TCS extensions - Pull request #561 at 36dcd19: Manual call-on is reset when passing an advanced signal - https://bugs.launchpad.net/or/+bug/1955907 - Pull request #562 at 44f35b4: Remove the locomotive handle from the script, because no interface function can allow access to any internal structure. - Pull request #564 at 609e192: Added TCS parameters file path in consist files (+ refactoring and code cleanup) - Pull request #567 at 91eb262: Adds 64-bit compatibility - Pull request #571 at fdd6133: 01: Manual entries for Menu > Options corrected - Pull request #572 at 7ad5a93: docs: Improved clarity of making changes requirements - Pull request #580 at a80269a: SamplerStates can only be set after the ShaderPasses.Current.Apply(). - Pull request #581 at 2c1da3c: Blueprint https://blueprints.launchpad.net/or/+spec/traindpuinfo-web-server - Pull request #584 at 8bdde67: 02a: Removed option MSTSBin. Its sound events are now permanently active. - Pull request #585 at 9d8f392: 02b: Removed menu option checkFastFullScreenAltTab - Pull request #586 at 9d8f392: 02c: Removed option Cab 2D Stretch - Pull request #587 at 5d5394f: 02d: Removed menu option Curve-Dependent Resistance - Pull request #588 at db5e115: 02ef: Removed menu option Tunnel&Wind-Dependent Resistance - Pull request #589 at 760ba43: 02g: Removed menu option LODViewingExtention - Pull request #590 at 2f1cdf2: 02h: Removed menu option CircularSpeedGauge. Now always available. - Pull request #593 at 72ec4b1: Initial Diesel Mechanic Locomotive Simulation - Pull request #594 at a6e8147: ScriptManager migration to the CodeAnalysis class. This is in preparation for the net 6 migration. - Pull request #595 at a5dd9cc: Release locomotive brake when player train enters game with speed > 0 - Pull request #596 at 3e46919: Fix for https://bugs.launchpad.net/or/+bug/1960519. Crash, diesel locomotive with vacuum brakes.
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
@@ -1156,6 +1156,7 @@ string brakeValue(string tokenIni, string tokenEnd) // used by GetDpuStatus(bool
             {
                 var indexIni = trainBrakeStatus.IndexOf(tokenIni) + tokenIni.Length + 1;
                 var indexEnd = trainBrakeStatus.IndexOf(tokenEnd) - indexIni;
+                if (indexEnd > 0)// BP found before EOT
                 brakeInfoValue = trainBrakeStatus.Substring(indexIni, indexEnd).TrimEnd();
             }
             return brakeInfoValue;
diff --git a/Source/RunActivity/Viewer3D/Popups/TrainDPUWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrainDPUWindow.cs
@@ -194,8 +194,10 @@ protected internal override void Restore(BinaryReader inf)
         protected internal override void Initialize()
         {
             base.Initialize();
-            // Reset window size
-            UpdateWindowSize();
+            if (Visible)
+            {   // Reset window size
+                UpdateWindowSize();
+            }
         }
 
         protected override ControlLayout Layout(ControlLayout layout)
@@ -537,7 +539,7 @@ private void UpdateColsWidth(ListLabel label, bool normalmode)
             }
             else
             {
-                if (this.Visible)
+                if (Visible)
                 {
                     // Detect Autopilot is on to avoid flickering when slim window is displayed
                     var AutopilotOn = Owner.Viewer.PlayerLocomotive.Train.TrainType == Train.TRAINTYPE.AI_PLAYERHOSTING ? true : false;

Original file line number	Diff line number	Diff line change
`@@ -1156,6 +1156,7 @@ string brakeValue(string tokenIni, string tokenEnd) // used by GetDpuStatus(bool`
`1156`	`1156`	`{`
`1157`	`1157`	`var indexIni = trainBrakeStatus.IndexOf(tokenIni) + tokenIni.Length + 1;`
`1158`	`1158`	`var indexEnd = trainBrakeStatus.IndexOf(tokenEnd) - indexIni;`
	`1159`	`+ if (indexEnd > 0)// BP found before EOT`
`1159`	`1160`	`brakeInfoValue = trainBrakeStatus.Substring(indexIni, indexEnd).TrimEnd();`
`1160`	`1161`	`}`
`1161`	`1162`	`return brakeInfoValue;`
Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,10 @@ protected internal override void Restore(BinaryReader inf)`
`194`	`194`	`protected internal override void Initialize()`
`195`	`195`	`{`
`196`	`196`	`base.Initialize();`
`197`		`- // Reset window size`
`198`		`- UpdateWindowSize();`
	`197`	`+ if (Visible)`
	`198`	`+ { // Reset window size`
	`199`	`+ UpdateWindowSize();`
	`200`	`+ }`
`199`	`201`	`}`
`200`	`202`
`201`	`203`	`protected override ControlLayout Layout(ControlLayout layout)`
`@@ -537,7 +539,7 @@ private void UpdateColsWidth(ListLabel label, bool normalmode)`
`537`	`539`	`}`
`538`	`540`	`else`
`539`	`541`	`{`
`540`		`- if (this.Visible)`
	`542`	`+ if (Visible)`
`541`	`543`	`{`
`542`	`544`	`// Detect Autopilot is on to avoid flickering when slim window is displayed`
`543`	`545`	`var AutopilotOn = Owner.Viewer.PlayerLocomotive.Train.TrainType == Train.TRAINTYPE.AI_PLAYERHOSTING ? true : false;`