Merge pull request #596 from mbm-OR/bugfix/Fix-DPU-Diesel-Vacuum

Fix for https://bugs.launchpad.net/or/+bug/1960519. Crash, diesel locomotive with vacuum brakes.

Author: mbm-OR

Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs

@@ -1056,7 +1056,8 @@ string brakeValue(string tokenIni, string tokenEnd) // used by GetDpuStatus(bool
             {
                 var indexIni = trainBrakeStatus.IndexOf(tokenIni) + tokenIni.Length + 1;
                 var indexEnd = trainBrakeStatus.IndexOf(tokenEnd) - indexIni;
-                brakeInfoValue = trainBrakeStatus.Substring(indexIni, indexEnd).TrimEnd();
+                if (indexEnd > 0)// BP found before EOT
+                    brakeInfoValue = trainBrakeStatus.Substring(indexIni, indexEnd).TrimEnd();
             }
             return brakeInfoValue;
         }

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;