Merge pull request #1008 from mbm-OR/bugfix/Fix-TrainCarOperations-not-working-as-expected-after-resume

Fix: TrainCarOperations doesn't work as expected after resume.

Author: mbm-OR

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/VacuumSinglePipe.cs

@@ -273,6 +273,7 @@ public override void Save(BinaryWriter outf)
             outf.Write(CylPressurePSIA);
             outf.Write(VacResPressurePSIA);
             outf.Write(FrontBrakeHoseConnected);
+            outf.Write(RearBrakeHoseConnected);
             outf.Write(AngleCockAOpen);
             outf.Write(AngleCockBOpen);
             outf.Write(BleedOffValveOpen);
@@ -286,6 +287,7 @@ public override void Restore(BinaryReader inf)
             CylPressurePSIA = inf.ReadSingle();
             VacResPressurePSIA = inf.ReadSingle();
             FrontBrakeHoseConnected = inf.ReadBoolean();
+            RearBrakeHoseConnected = inf.ReadBoolean();
             AngleCockAOpen = inf.ReadBoolean();
             AngleCockBOpen = inf.ReadBoolean();
             BleedOffValveOpen = inf.ReadBoolean();

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs

@@ -164,6 +164,7 @@ protected internal override void Save(BinaryWriter outf)
             outf.Write(Location.Height);
 
             outf.Write(SelectedCarPosition);
+            outf.Write(Owner.Viewer.FrontCamera.IsCameraFront);
         }
         protected internal override void Restore(BinaryReader inf)
         {
@@ -175,6 +176,7 @@ protected internal override void Restore(BinaryReader inf)
             LocationRestore.Height = inf.ReadInt32();
 
             SelectedCarPosition = inf.ReadInt32();
+            Owner.Viewer.FrontCamera.IsCameraFront = inf.ReadBoolean();
 
             // Display window
             SizeTo(LocationRestore.Width, LocationRestore.Height);
@@ -581,7 +583,7 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
                 var trainCarWebpage = Owner.Viewer.TrainCarOperationsWebpage;
 
                 // Allows interaction with <Alt>+<PageDown> and <Alt>+<PageUP>.
-                if (Owner.Viewer.Camera.AttachedCar != null && !(Owner.Viewer.Camera is CabCamera) && Owner.Viewer.Camera != Owner.Viewer.ThreeDimCabCamera && (trainCarViewer.Visible || Visible))
+                if (CarPositionChanged && Owner.Viewer.Camera.AttachedCar != null && !(Owner.Viewer.Camera is CabCamera) && Owner.Viewer.Camera != Owner.Viewer.ThreeDimCabCamera && (trainCarViewer.Visible || Visible))
                 {
                     var currentCameraCarID = Owner.Viewer.Camera.AttachedCar.CarID;
                     if (PlayerTrain != null && (currentCameraCarID != trainCarViewer.CurrentCarID || CarPosition != trainCarViewer.CarPosition))