Merge branch 'refactor-user-settings-location' into refactor-user-settings-loc/export-settings

rwf-rr · rwf-rr · commit e275f68ab451 · 2025-01-30T15:44:10.000-08:00
diff --git a/Source/Orts.Common/SettingsBase.cs b/Source/Orts.Common/SettingsBase.cs
@@ -52,7 +52,7 @@ static SettingsBase()
         /// </summary>
         /// <param name="filePath">The new ini file path, relative to the OpenRails base directory, or NULL.</param>
         /// <param name="registryKey">The new registry key, relative to the HKEY_CURRENT_USER, or NULL.</param>
-        static public void OverrideSettingsLocations(string filePath, string registryKey)
+        public static void OverrideSettingsLocations(string filePath, string registryKey)
         {
             if (!String.IsNullOrEmpty(filePath) && !String.IsNullOrEmpty(registryKey))
             {

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ static SettingsBase()`
`52`	`52`	`/// </summary>`
`53`	`53`	`/// <param name="filePath">The new ini file path, relative to the OpenRails base directory, or NULL.</param>`
`54`	`54`	`/// <param name="registryKey">The new registry key, relative to the HKEY_CURRENT_USER, or NULL.</param>`
`55`		`- static public void OverrideSettingsLocations(string filePath, string registryKey)`
	`55`	`+ public static void OverrideSettingsLocations(string filePath, string registryKey)`
`56`	`56`	`{`
`57`	`57`	`if (!String.IsNullOrEmpty(filePath) && !String.IsNullOrEmpty(registryKey))`
`58`	`58`	`{`