Skip to content

Commit 3250dea

Browse files
committed
Fix crash when webserver is disabled
1 parent 4fc6a7b commit 3250dea

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Source/RunActivity/Viewer3D/Cameras.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,7 @@ protected override void OnActivate(bool sameCamera)
10801080
}
10811081
else
10821082
{
1083-
isVisibleTrainCarViewerOrWebpage = (Viewer.TrainCarOperationsWindow.Visible && !Viewer.TrainCarOperationsViewerWindow.Visible) || Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage.Connections > 0 && Viewer.TrainCarOperationsWebpage.TrainCarSelected);
1083+
isVisibleTrainCarViewerOrWebpage = (Viewer.TrainCarOperationsWindow.Visible && !Viewer.TrainCarOperationsViewerWindow.Visible) || Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage?.Connections > 0 && Viewer.TrainCarOperationsWebpage.TrainCarSelected);
10841084
}
10851085

10861086
if (attachedCar == null || attachedCar.Train != Viewer.SelectedTrain || carPosition != oldCarPosition)

Source/RunActivity/Viewer3D/Viewer.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ public void Update(RenderFrame frame, float elapsedRealTime)
789789
// We need to do it also here, because passing from manual to auto a ReverseFormation may be needed
790790
if (Camera is TrackingCamera && Camera.AttachedCar != null && Camera.AttachedCar.Train != null && Camera.AttachedCar.Train.FormationReversed)
791791
{
792-
IsFormationReversed = TrainCarOperationsWindow.Visible || TrainCarOperationsWebpage.Connections > 0;
792+
IsFormationReversed = TrainCarOperationsWindow.Visible || TrainCarOperationsWebpage?.Connections > 0;
793793
Camera.AttachedCar.Train.FormationReversed = false;
794794
(Camera as TrackingCamera).SwapCameras();
795795
}
@@ -845,7 +845,7 @@ public void Update(RenderFrame frame, float elapsedRealTime)
845845
// Check if you need to swap camera
846846
if (Camera is TrackingCamera && Camera.AttachedCar != null && Camera.AttachedCar.Train != null && Camera.AttachedCar.Train.FormationReversed)
847847
{
848-
IsFormationReversed = TrainCarOperationsWindow.Visible || TrainCarOperationsWebpage.Connections > 0;
848+
IsFormationReversed = TrainCarOperationsWindow.Visible || TrainCarOperationsWebpage?.Connections > 0;
849849
Camera.AttachedCar.Train.FormationReversed = false;
850850
(Camera as TrackingCamera).SwapCameras();
851851
}

0 commit comments

Comments
 (0)