Correct issue with save/resume not working

Author: peternewell

Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs

@@ -94,6 +94,7 @@ public float DieselLevelL
         public int currentGearIndexRestore = -1;
         public int currentnextGearRestore = -1;
         public bool gearSaved;
+        public int dieselEngineRestoreState;
 
         public float EngineRPM;
         public SmoothedData ExhaustParticles = new SmoothedData(1);

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs

@@ -1022,11 +1022,16 @@ public void Copy(DieselEngine other)
 
         public void Initialize()
         {
-            if (!Simulator.Settings.NoDieselEngineStart)
+            if (!Simulator.Settings.NoDieselEngineStart && !Locomotive.gearSaved)
             {
                 RealRPM = IdleRPM;
                 State = DieselEngineState.Running;
             }
+            else if (Locomotive.gearSaved)
+            {
+                State = (DieselEngineState)Locomotive.dieselEngineRestoreState;
+            }
+
             RPMRange = MaxRPM - IdleRPM;
             MagnitudeRange = MaxMagnitude - InitialMagnitude;
             ExhaustRange = MaxExhaust - InitialExhaust;
@@ -1042,8 +1047,15 @@ public void Initialize()
 
         public void InitializeMoving()
         {
-            RealRPM = IdleRPM;
-            State = DieselEngineState.Running;
+            if (!Simulator.Settings.NoDieselEngineStart && !Locomotive.gearSaved)
+            {
+                RealRPM = IdleRPM;
+                State = DieselEngineState.Running;
+            }
+            else if (Locomotive.gearSaved)
+            {
+                State = (DieselEngineState)Locomotive.dieselEngineRestoreState;
+            }
 
             GearBox?.InitializeMoving();
         }
@@ -1592,7 +1604,8 @@ public void HandleEvent(PowerSupplyEvent evt)
 
         public void Restore(BinaryReader inf)
         {
-            State = (DieselEngineState)inf.ReadInt32();
+            Locomotive.dieselEngineRestoreState = inf.ReadInt32();
+            State = (DieselEngineState)Locomotive.dieselEngineRestoreState;
             RealRPM = inf.ReadSingle();
             OutputPowerW = inf.ReadSingle();
             DieselTemperatureDeg = inf.ReadSingle();