set SelectedCarPosition to zero when uncoupling

sweiland-openrails · sweiland-openrails · commit 03c6f8f69605 · 2025-07-24T14:17:52.000+02:00
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,10 +708,7 @@ public void buttonCouplerFrontClick(int carPosition)
                 TrainCarViewer.NewCarPosition = carPosition - 1;
                 if (Viewer.CarOperationsWindow.CarPosition > carPosition - 1)
                     Viewer.CarOperationsWindow.Visible = false;
-                if (Viewer.TrainCarOperationsWindow.SelectedCarPosition >= Viewer.PlayerTrain.Cars.Count())
-                {
-                    Viewer.TrainCarOperationsWindow.SelectedCarPosition = Viewer.PlayerTrain.Cars.Count - 1;
-                }
+                Viewer.TrainCarOperationsWindow.SelectedCarPosition = 0;
             }
         }
 
@@ -812,10 +807,7 @@ public void buttonCouplerRearClick(int carPosition)
                 TrainCarViewer.CouplerChanged = true;
                 if (Viewer.CarOperationsWindow.CarPosition > carPosition)
                     Viewer.CarOperationsWindow.Visible = false;
-                if (Viewer.TrainCarOperationsWindow.SelectedCarPosition >= Viewer.PlayerTrain.Cars.Count())
-                {
-                    Viewer.TrainCarOperationsWindow.SelectedCarPosition = Viewer.PlayerTrain.Cars.Count - 1;
-                }
+                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,10 +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;`
`713`		`- if (Viewer.TrainCarOperationsWindow.SelectedCarPosition >= Viewer.PlayerTrain.Cars.Count())`
`714`		`- {`
`715`		`- Viewer.TrainCarOperationsWindow.SelectedCarPosition = Viewer.PlayerTrain.Cars.Count - 1;`
`716`		`- }`
	`711`	`+ Viewer.TrainCarOperationsWindow.SelectedCarPosition = 0;`
`717`	`712`	`}`
`718`	`713`	`}`
`719`	`714`
`@@ -812,10 +807,7 @@ public void buttonCouplerRearClick(int carPosition)`
`812`	`807`	`TrainCarViewer.CouplerChanged = true;`
`813`	`808`	`if (Viewer.CarOperationsWindow.CarPosition > carPosition)`
`814`	`809`	`Viewer.CarOperationsWindow.Visible = false;`
`815`		`- if (Viewer.TrainCarOperationsWindow.SelectedCarPosition >= Viewer.PlayerTrain.Cars.Count())`
`816`		`- {`
`817`		`- Viewer.TrainCarOperationsWindow.SelectedCarPosition = Viewer.PlayerTrain.Cars.Count - 1;`
`818`		`- }`
	`810`	`+ Viewer.TrainCarOperationsWindow.SelectedCarPosition = 0;`
`819`	`811`	`}`
`820`	`812`	`}`
`821`	`813`