Bug fixes

cesarBLG · cesarBLG · commit e813c42c9c27 · 2025-09-06T15:59:55.000+02:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs
@@ -402,8 +402,7 @@ public void Parse(STFReader stf)
                     case "modeswitchallowedwiththrottlenotatzero": ModeSwitchAllowedWithThrottleNotAtZero = stf.ReadBoolBlock(false); break;
                     case "docomputenumberofaxles": DoComputeNumberOfAxles = stf.ReadBoolBlock(false); break;
                     case "speeddeltafunctionmode":
-                        stf.MustMatch("(");
-                        var speedDeltaMode = stf.ReadString();
+                        var speedDeltaMode = stf.ReadStringBlock("");
                         try
                         {
                             SpeedDeltaFunctionMode = (SpeedDeltaMode)Enum.Parse(typeof(SpeedDeltaMode), speedDeltaMode, true);
@@ -853,7 +852,11 @@ public void UpdateSpeedRegulatorModeChanges()
             }
             if (ForceRegulatorAutoWhenNonZeroSpeedSelected)
             {
-                if (zeroSelectedSpeed && (!ASCSpeedTakesPriorityOverSpeedSelector || !ASCSetSpeedMpS.HasValue))
+                if (ASCSpeedTakesPriorityOverSpeedSelector && ASCSetSpeedMpS.HasValue)
+                {
+                    SpeedRegMode = SpeedRegulatorMode.Auto;
+                }
+                else if (zeroSelectedSpeed)
                 {
                     SpeedRegMode = SpeedRegulatorMode.Manual;
                 }

Original file line number	Diff line number	Diff line change
`@@ -402,8 +402,7 @@ public void Parse(STFReader stf)`
`402`	`402`	`case "modeswitchallowedwiththrottlenotatzero": ModeSwitchAllowedWithThrottleNotAtZero = stf.ReadBoolBlock(false); break;`
`403`	`403`	`case "docomputenumberofaxles": DoComputeNumberOfAxles = stf.ReadBoolBlock(false); break;`
`404`	`404`	`case "speeddeltafunctionmode":`
`405`		`- stf.MustMatch("(");`
`406`		`- var speedDeltaMode = stf.ReadString();`
	`405`	`+ var speedDeltaMode = stf.ReadStringBlock("");`
`407`	`406`	`try`
`408`	`407`	`{`
`409`	`408`	`SpeedDeltaFunctionMode = (SpeedDeltaMode)Enum.Parse(typeof(SpeedDeltaMode), speedDeltaMode, true);`
`@@ -853,7 +852,11 @@ public void UpdateSpeedRegulatorModeChanges()`
`853`	`852`	`}`
`854`	`853`	`if (ForceRegulatorAutoWhenNonZeroSpeedSelected)`
`855`	`854`	`{`
`856`		`- if (zeroSelectedSpeed && (!ASCSpeedTakesPriorityOverSpeedSelector \|\| !ASCSetSpeedMpS.HasValue))`
	`855`	`+ if (ASCSpeedTakesPriorityOverSpeedSelector && ASCSetSpeedMpS.HasValue)`
	`856`	`+ {`
	`857`	`+ SpeedRegMode = SpeedRegulatorMode.Auto;`
	`858`	`+ }`
	`859`	`+ else if (zeroSelectedSpeed)`
`857`	`860`	`{`
`858`	`861`	`SpeedRegMode = SpeedRegulatorMode.Manual;`
`859`	`862`	`}`