Merge pull request #816 from Csantucci/fix-EOT-dismount-after-reverse

Bug fix for https://bugs.launchpad.net/or/+bug/2014992 EOT can't be dismounted after train reversal

Author: Csantucci

Source/Orts.Simulation/Common/Commands.cs

@@ -2268,9 +2268,9 @@ public override void Redo()
         {
             if (Receiver?.Train != null)
             {
+                var wagonFilePath = PickedEOTType.ToLower();
                 if (ToState)
                 {
-                    var wagonFilePath = PickedEOTType.ToLower();
                     try
                     {
                         EOT eot = (EOT)RollingStock.Load(Receiver.Train.Simulator, Receiver.Train, wagonFilePath);
@@ -2287,8 +2287,14 @@ public override void Redo()
                 }
                 else
                 {
-                    Receiver.Train.RecalculateRearTDBTraveller();
                     var car = Receiver.Train.Cars[Receiver.Train.Cars.Count - 1];
+                    if (wagonFilePath != car.WagFilePath.ToLower())
+                    {
+                        car = Receiver.Train.Cars[0];
+                        if (Receiver.Train.LeadLocomotive != null) Receiver.Train.LeadLocomotiveIndex--;
+                    }
+                    else
+                        Receiver.Train.RecalculateRearTDBTraveller();
                     car.Train = null;
                     car.IsPartOfActiveTrain = false;  // to stop sounds
                     Receiver.Train.Cars.Remove(car);

Source/RunActivity/Viewer3D/Popups/EOTListWindow.cs

@@ -103,7 +103,8 @@ void EOTListLabel_Click(Control arg1, Point arg2)
                     Viewer.Simulator.Confirmer.Information(Viewer.Catalog.GetString("Can't attach EOT if player train not stopped"));
                     return;
                 }
-                if (PickedEOTTypeFromList.ToLower() != Viewer.PlayerLocomotive.Train.Cars[Viewer.PlayerLocomotive.Train.Cars.Count - 1].WagFilePath.ToLower())
+                if (PickedEOTTypeFromList.ToLower() != Viewer.PlayerLocomotive.Train.Cars[Viewer.PlayerLocomotive.Train.Cars.Count - 1].WagFilePath.ToLower() &&
+                    PickedEOTTypeFromList.ToLower() != Viewer.PlayerLocomotive.Train.Cars[0].WagFilePath.ToLower())
                 {
                     if (Viewer.PlayerLocomotive.Train?.EOT != null)
                     {
@@ -113,7 +114,8 @@ void EOTListLabel_Click(Control arg1, Point arg2)
                     //Ask to mount EOT
                     new EOTMountCommand(Viewer.Log, true, PickedEOTTypeFromList);
                 }
-                else if (PickedEOTTypeFromList.ToLower() == Viewer.PlayerLocomotive.Train.Cars[Viewer.PlayerLocomotive.Train.Cars.Count - 1].WagFilePath.ToLower())
+                else if (PickedEOTTypeFromList.ToLower() == Viewer.PlayerLocomotive.Train.Cars[Viewer.PlayerLocomotive.Train.Cars.Count - 1].WagFilePath.ToLower() ||
+                    PickedEOTTypeFromList.ToLower() == Viewer.PlayerLocomotive.Train.Cars[0].WagFilePath.ToLower())
                 {
                     new EOTMountCommand(Viewer.Log, false, PickedEOTTypeFromList);
                 }