Merge pull request #1161 from cesarBLG/fix-script-ini

cesarBLG · web-flow · commit 8fb3285d6873 · 2025-09-30T15:10:05.000+02:00
Fix string trim in .ini files
diff --git a/Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs b/Source/Orts.Simulation/Common/Scripting/PowerSupply/LocomotivePowerSupply.cs
@@ -606,7 +606,7 @@ protected T LoadParameter<T>(string sectionName, string keyName, T defaultValue)
 
                 if (length > 0)
                 {
-                    buffer.Trim();
+                    buffer = buffer.Trim('\0').Trim();
                     return (T)Convert.ChangeType(buffer, typeof(T), System.Globalization.CultureInfo.InvariantCulture);
                 }
             }
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
@@ -920,7 +920,7 @@ private T LoadParameter<T>(string sectionName, string keyName, T defaultValue)
 
                 if (length > 0)
                 {
-                    buffer.Trim();
+                    buffer = buffer.Trim('\0').Trim();
                     return (T)Convert.ChangeType(buffer, typeof(T), System.Globalization.CultureInfo.InvariantCulture);
                 }
             }
@@ -932,7 +932,7 @@ private T LoadParameter<T>(string sectionName, string keyName, T defaultValue)
 
                 if (length > 0)
                 {
-                    buffer.Trim();
+                    buffer = buffer.Trim('\0').Trim();
                     return (T)Convert.ChangeType(buffer, typeof(T), System.Globalization.CultureInfo.InvariantCulture);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,7 @@ protected T LoadParameter<T>(string sectionName, string keyName, T defaultValue)`
`606`	`606`
`607`	`607`	`if (length > 0)`
`608`	`608`	`{`
`609`		`- buffer.Trim();`
	`609`	`+ buffer = buffer.Trim('\0').Trim();`
`610`	`610`	`return (T)Convert.ChangeType(buffer, typeof(T), System.Globalization.CultureInfo.InvariantCulture);`
`611`	`611`	`}`
`612`	`612`	`}`
Original file line number	Diff line number	Diff line change
`@@ -920,7 +920,7 @@ private T LoadParameter<T>(string sectionName, string keyName, T defaultValue)`
`920`	`920`
`921`	`921`	`if (length > 0)`
`922`	`922`	`{`
`923`		`- buffer.Trim();`
	`923`	`+ buffer = buffer.Trim('\0').Trim();`
`924`	`924`	`return (T)Convert.ChangeType(buffer, typeof(T), System.Globalization.CultureInfo.InvariantCulture);`
`925`	`925`	`}`
`926`	`926`	`}`
`@@ -932,7 +932,7 @@ private T LoadParameter<T>(string sectionName, string keyName, T defaultValue)`
`932`	`932`
`933`	`933`	`if (length > 0)`
`934`	`934`	`{`
`935`		`- buffer.Trim();`
	`935`	`+ buffer = buffer.Trim('\0').Trim();`
`936`	`936`	`return (T)Convert.ChangeType(buffer, typeof(T), System.Globalization.CultureInfo.InvariantCulture);`
`937`	`937`	`}`
`938`	`938`	`}`