File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -651,7 +651,7 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
651651 }
652652
653653 // Restore LastCarIDSelected (F9) after returning from different camera views
654- if ( CarIdClicked && Owner . Viewer . Camera . AttachedCar . CarID != LastCarIDSelected )
654+ if ( CarIdClicked && Owner . Viewer . Camera . AttachedCar != null && Owner . Viewer . Camera . AttachedCar . CarID != LastCarIDSelected )
655655 {
656656 trainCarViewer . CurrentCarID = LastCarIDSelected ;
657657 trainCarViewer . CarPosition = CarPosition = PlayerTrain . Cars . TakeWhile ( x => x . CarID != LastCarIDSelected ) . Count ( ) ;
@@ -795,7 +795,7 @@ public FormationReversed(Viewer viewer, Train PlayerTrain)
795795 Viewer = viewer ;
796796 TrainCar = Viewer . TrainCarOperationsWindow ;
797797 TrainCarViewer = Viewer . TrainCarOperationsViewerWindow ;
798- var currentCameraCarID = Viewer . Camera . AttachedCar . CarID ;
798+ var currentCameraCarID = Viewer . Camera . AttachedCar != null ? Viewer . Camera . AttachedCar . CarID : TrainCar . LastCarIDSelected ;
799799
800800 TrainCarViewer . CurrentCarID = TrainCar . LastCarIDSelected ;
801801 TrainCarViewer . CarPosition = TrainCar . CarPosition = PlayerTrain . Cars . TakeWhile ( x => x . CarID != TrainCar . LastCarIDSelected ) . Count ( ) ;
You can’t perform that action at this time.
0 commit comments