Fix bug when switching from cab camera to camera 2.

Author: mbm-OR

Source/RunActivity/Viewer3D/Cameras.cs

@@ -1083,9 +1083,6 @@ protected override void OnActivate(bool sameCamera)
                 isVisibleTrainCarViewerOrWebpage = (Viewer.TrainCarOperationsWindow.Visible && !Viewer.TrainCarOperationsViewerWindow.Visible) || Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage?.Connections > 0 && Viewer.TrainCarOperationsWebpage.TrainCarSelected);
             }
 
-            // Update the camera view
-            oldCarPosition = oldCarPosition == 0 && carPosition == 0 ? -1 : oldCarPosition;
-
             if (attachedCar == null || attachedCar.Train != Viewer.SelectedTrain || carPosition != oldCarPosition)
             {
                 if (Front)

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs

@@ -512,9 +512,9 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
                 }
                 // Updates power supply status
                 else if (isElectricDieselLocomotive &&
-                     (PowerSupplyStatus != null && PowerSupplyStatus != Owner.Viewer.PlayerTrain.Cars[CarPosition].GetStatus()
+                      (PowerSupplyStatus != null && PowerSupplyStatus != Owner.Viewer.PlayerTrain.Cars[CarPosition].GetStatus()
                       || (BatteryStatus != null && BatteryStatus != Owner.Viewer.PlayerTrain.Cars[CarPosition].GetStatus())
-                      || (CircuitBreakerState != null && CircuitBreakerState != (trainCar as MSTSElectricLocomotive).ElectricPowerSupply.CircuitBreaker.State.ToString())))
+                      || (CircuitBreakerState != null && (trainCar is MSTSElectricLocomotive) && CircuitBreakerState != (trainCar as MSTSElectricLocomotive).ElectricPowerSupply.CircuitBreaker.State.ToString())))
                 {
                     Layout();
                     UpdateWindowSize();