Skip to content

Commit b47224d

Browse files
Fix for bug https://bugs.launchpad.net/or/+bug/2117357. Exception index of of range when opening Train Car Operations window
1 parent ade0195 commit b47224d

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,10 @@ public void buttonCouplerFrontClick(int carPosition)
710710
TrainCarViewer.NewCarPosition = carPosition - 1;
711711
if (Viewer.CarOperationsWindow.CarPosition > carPosition - 1)
712712
Viewer.CarOperationsWindow.Visible = false;
713+
if (Viewer.TrainCarOperationsWindow.SelectedCarPosition >= Viewer.PlayerTrain.Cars.Count())
714+
{
715+
Viewer.TrainCarOperationsWindow.SelectedCarPosition = Viewer.PlayerTrain.Cars.Count - 1;
716+
}
713717
}
714718
}
715719

@@ -808,6 +812,10 @@ public void buttonCouplerRearClick(int carPosition)
808812
TrainCarViewer.CouplerChanged = true;
809813
if (Viewer.CarOperationsWindow.CarPosition > carPosition)
810814
Viewer.CarOperationsWindow.Visible = false;
815+
if (Viewer.TrainCarOperationsWindow.SelectedCarPosition >= Viewer.PlayerTrain.Cars.Count())
816+
{
817+
Viewer.TrainCarOperationsWindow.SelectedCarPosition = Viewer.PlayerTrain.Cars.Count - 1;
818+
}
811819
}
812820
}
813821

0 commit comments

Comments
 (0)