setting default update channel

fixing minor issues
perpetualKid · Sep 17, 2020 · 570e4cd · 570e4cd
1 parent 3c21ac7
commit 570e4cd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/Source/Menu/MainForm.cs b/Source/Menu/MainForm.cs
@@ -191,7 +191,7 @@ private async void MainForm_Shown(object sender, EventArgs e)
             if (!initialized)
             {
                 initTasks.Add(CheckForUpdateAsync());
-                initTasks.Add(Task.Run(LoadToolsAndDocuments));
+                LoadToolsAndDocuments();
 
                 comboBoxStartSeason.DataSourceFromEnumIndex<SeasonType>(commonCatalog);
                 comboBoxStartWeather.DataSourceFromEnumIndex<WeatherType>(commonCatalog);

diff --git a/Source/Menu/Options.Designer.cs b/Source/Menu/Options.Designer.cs
diff --git a/Source/Orts.Settings/Store/SettingsStoreLocalIni.cs b/Source/Orts.Settings/Store/SettingsStoreLocalIni.cs
@@ -107,7 +107,7 @@ protected override object GetSettingValue(string name, Type expectedType)
 
                 if (expectedType.IsEnum)
                 {
-                    return Enum.Parse(expectedType, userValue);
+                    return Enum.Parse(expectedType, userValue, true);
                 }
                 else
                     // Convert whatever we're left with into the expected type.

diff --git a/Source/Orts.Settings/Store/SettingsStoreRegistry.cs b/Source/Orts.Settings/Store/SettingsStoreRegistry.cs
@@ -7,6 +7,8 @@
 
 using Microsoft.Win32;
 
+using Orts.Common;
+
 namespace Orts.Settings.Store
 {
     /// <summary>
@@ -72,7 +74,7 @@ protected override object GetSettingValue(string name, Type expectedType)
                     return intValues.Split(',').Select(s => int.Parse(s, CultureInfo.InvariantCulture)).ToArray();
 
                 if (expectedType.IsEnum && userValue is string enumValue)
-                    return Enum.Parse(expectedType, enumValue);
+                    return Enum.Parse(expectedType, enumValue, true);
 
                 // Convert whatever we're left with into the expected type.
                 return Convert.ChangeType(userValue, expectedType, CultureInfo.InvariantCulture);

diff --git a/Source/Orts.Settings/UserSettings.cs b/Source/Orts.Settings/UserSettings.cs
@@ -218,7 +218,7 @@ static UserSettings()
         #region update settings
         [Default((int)Orts.Common.UpdateCheckFrequency.Always)]
         public int UpdateCheckFrequency { get; set; }
-        [Default("")]
+        [Default("rc")]
         public string UpdateChannel { get; set; }
         [Default("https://ultimaterails.blob.core.windows.net/builds/")]
         public string UpdateSource { get; set; }