Skip to content

Commit 7915033

Browse files
authored
Merge pull request #1163 from mbm-OR/bugfix/Fix-camera8-F9-crash
Fix: Crash when using Camera 8 and F9.
2 parents 2dd8a46 + 2f9e292 commit 7915033

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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();

0 commit comments

Comments
 (0)