Merge pull request #1139 from sweiland-openrails/IndexOutOfRangeTrainCarOperations

cjakeman · web-flow · commit e3d1d75f9cec · 2025-08-14T15:43:16.000+01:00
Fix for bug https://bugs.launchpad.net/or/+bug/2117357.
diff --git a/Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs b/Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs
@@ -31,8 +31,6 @@
 using Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS;
 using ORTS.Scripting.Api;
 using System.IO;
-using Orts.Simulation.Physics;
-using Orts.Simulation.RollingStocks.SubSystems.Brakes;
 
 namespace Orts.Viewer3D.WebServices
 {
@@ -710,6 +708,7 @@ public void buttonCouplerFrontClick(int carPosition)
                 TrainCarViewer.NewCarPosition = carPosition - 1;
                 if (Viewer.CarOperationsWindow.CarPosition > carPosition - 1)
                     Viewer.CarOperationsWindow.Visible = false;
+                Viewer.TrainCarOperationsWindow.SelectedCarPosition = 0;
             }
         }
 
@@ -808,6 +807,7 @@ public void buttonCouplerRearClick(int carPosition)
                 TrainCarViewer.CouplerChanged = true;
                 if (Viewer.CarOperationsWindow.CarPosition > carPosition)
                     Viewer.CarOperationsWindow.Visible = false;
+                Viewer.TrainCarOperationsWindow.SelectedCarPosition = 0;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@`
`31`	`31`	`using Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS;`
`32`	`32`	`using ORTS.Scripting.Api;`
`33`	`33`	`using System.IO;`
`34`		`-using Orts.Simulation.Physics;`
`35`		`-using Orts.Simulation.RollingStocks.SubSystems.Brakes;`
`36`	`34`
`37`	`35`	`namespace Orts.Viewer3D.WebServices`
`38`	`36`	`{`
`@@ -710,6 +708,7 @@ public void buttonCouplerFrontClick(int carPosition)`
`710`	`708`	`TrainCarViewer.NewCarPosition = carPosition - 1;`
`711`	`709`	`if (Viewer.CarOperationsWindow.CarPosition > carPosition - 1)`
`712`	`710`	`Viewer.CarOperationsWindow.Visible = false;`
	`711`	`+ Viewer.TrainCarOperationsWindow.SelectedCarPosition = 0;`
`713`	`712`	`}`
`714`	`713`	`}`
`715`	`714`
`@@ -808,6 +807,7 @@ public void buttonCouplerRearClick(int carPosition)`
`808`	`807`	`TrainCarViewer.CouplerChanged = true;`
`809`	`808`	`if (Viewer.CarOperationsWindow.CarPosition > carPosition)`
`810`	`809`	`Viewer.CarOperationsWindow.Visible = false;`
	`810`	`+ Viewer.TrainCarOperationsWindow.SelectedCarPosition = 0;`
`811`	`811`	`}`
`812`	`812`	`}`
`813`	`813`