Problems about what camera should be shown.

Author: mbm-OR

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs

@@ -92,6 +92,7 @@ public class TrainCarOperationsViewerWindow : Window
         public int WindowHeightMax;
         public int WindowWidthMin;
         public int WindowWidthMax;
+        public bool SavedCabCamera;
         public int windowHeight { get; set; } //required by TrainCarWindow
         public int CarPosition
         {
@@ -159,6 +160,9 @@ protected internal override void Save(BinaryWriter outf)
 
             outf.Write(CarPosition);
             outf.Write(ResetAllSymbols);
+
+            var saveCabCamera = Owner.Viewer.Camera is CabCamera || Owner.Viewer.Camera == Owner.Viewer.ThreeDimCabCamera;
+            outf.Write(saveCabCamera);
         }
         protected internal override void Restore(BinaryReader inf)
         {
@@ -171,6 +175,7 @@ protected internal override void Restore(BinaryReader inf)
 
             CarPosition = inf.ReadInt32();
             ResetAllSymbols = inf.ReadBoolean();
+            SavedCabCamera = inf.ReadBoolean();
 
             // Display window
             SizeTo(LocationRestore.Width, LocationRestore.Height);
@@ -472,8 +477,12 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
                 {
                     // Updates CarPosition
                     CarPosition = CouplerChanged ? NewCarPosition : CarPosition;
-                    
-                    if (OldCarPosition != CarPosition || (trainCarOperations.CarIdClicked && CarPosition == 0))
+
+                    if (SavedCabCamera)
+                    {
+                        SavedCabCamera = false;
+                    }
+                    else if (OldCarPosition != CarPosition || (trainCarOperations.CarIdClicked && CarPosition == 0))
                     {
                         Owner.Viewer.FrontCamera.Activate();
                     }