Skip to content

Commit 4af2b15

Browse files
committed
Automatic merge of T1.6-rc4-34-g041d7ab18 and 17 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at aa72c13: Automatic speed control - Pull request #1104 at 86d38a2: Handle simple adhesion within the axle module - Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at abe7c8a: Fix F9 points to an incorrect car ID. - Pull request #1132 at 934d29e: Fixes For Correct Questionable Braking Parameters - Pull request #1133 at 8dc00d5: Minor Fix for Brake Pipe Charging - Pull request #1136 at 6f1b82f: Fix Curve Resistance Calculation - Pull request #1137 at c2c9e2a: Apply brakes at startup on minimal reduction - Pull request #1139 at b47224d: Fix for bug https://bugs.launchpad.net/or/+bug/2117357. - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 58de4c3: Particle Emitter Overhaul
19 parents d34894f + 041d7ab + e10390b + aa72c13 + 86d38a2 + 387388e + 270f22f + ba3c47f + 91d2d26 + abe7c8a + 934d29e + 8dc00d5 + 6f1b82f + c2c9e2a + b47224d + 5845a1a + 689494b + fab5457 + 58de4c3 commit 4af2b15

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
@@ -711,6 +711,10 @@ public void buttonCouplerFrontClick(int carPosition)
711711
TrainCarViewer.NewCarPosition = carPosition - 1;
712712
if (Viewer.CarOperationsWindow.CarPosition > carPosition - 1)
713713
Viewer.CarOperationsWindow.Visible = false;
714+
if (Viewer.TrainCarOperationsWindow.SelectedCarPosition >= Viewer.PlayerTrain.Cars.Count())
715+
{
716+
Viewer.TrainCarOperationsWindow.SelectedCarPosition = Viewer.PlayerTrain.Cars.Count - 1;
717+
}
714718
}
715719
}
716720

@@ -810,6 +814,10 @@ public void buttonCouplerRearClick(int carPosition)
810814
TrainCarViewer.CouplerChanged = TrainCar.CouplerClicked = true;
811815
if (Viewer.CarOperationsWindow.CarPosition > carPosition)
812816
Viewer.CarOperationsWindow.Visible = false;
817+
if (Viewer.TrainCarOperationsWindow.SelectedCarPosition >= Viewer.PlayerTrain.Cars.Count())
818+
{
819+
Viewer.TrainCarOperationsWindow.SelectedCarPosition = Viewer.PlayerTrain.Cars.Count - 1;
820+
}
813821
}
814822
}
815823

0 commit comments

Comments
 (0)