Merge pull request #1014 from Csantucci/fix-train-disappearing

Csantucci · web-flow · commit 54d55cf2cc63 · 2024-12-18T21:36:13.000+01:00
Bug fix for https://bugs.launchpad.net/or/+bug/2091895 Train disappears from train list window
diff --git a/Source/Orts.Simulation/Simulation/Simulator.cs b/Source/Orts.Simulation/Simulation/Simulator.cs
@@ -1955,13 +1955,14 @@ private void StartSwitchPlayerTrain()
                             TrainSwitcher.ClickedSelectedAsPlayer = false;
                             return;
                         }
-                        if (playerTrain.TrainType == Train.TRAINTYPE.AI_PLAYERDRIVEN || !playerTrain.Autopilot)
+                        if (playerTrain.TrainType == Train.TRAINTYPE.AI_PLAYERDRIVEN || TimetableMode && !playerTrain.Autopilot)
                         {
                             // it must be autopiloted first
                             playerTrain.SwitchToAutopilotControl();
                         }
                         // and now switch!
                         playerTrain.TrainType = Train.TRAINTYPE.AI;
+                        if (!TimetableMode) AI.AITrains.Add(playerTrain);
                         playerTrain.Autopilot = false;
                         if (TrainSwitcher.SuspendOldPlayer)
                         {

Original file line number	Diff line number	Diff line change
`@@ -1955,13 +1955,14 @@ private void StartSwitchPlayerTrain()`
`1955`	`1955`	`TrainSwitcher.ClickedSelectedAsPlayer = false;`
`1956`	`1956`	`return;`
`1957`	`1957`	`}`
`1958`		`- if (playerTrain.TrainType == Train.TRAINTYPE.AI_PLAYERDRIVEN \|\| !playerTrain.Autopilot)`
	`1958`	`+ if (playerTrain.TrainType == Train.TRAINTYPE.AI_PLAYERDRIVEN \|\| TimetableMode && !playerTrain.Autopilot)`
`1959`	`1959`	`{`
`1960`	`1960`	`// it must be autopiloted first`
`1961`	`1961`	`playerTrain.SwitchToAutopilotControl();`
`1962`	`1962`	`}`
`1963`	`1963`	`// and now switch!`
`1964`	`1964`	`playerTrain.TrainType = Train.TRAINTYPE.AI;`
	`1965`	`+ if (!TimetableMode) AI.AITrains.Add(playerTrain);`
`1965`	`1966`	`playerTrain.Autopilot = false;`
`1966`	`1967`	`if (TrainSwitcher.SuspendOldPlayer)`
`1967`	`1968`	`{`