Fix crash when saving account data

Apparently, SelectedItem cannot be casted to a nullable type. This also expands the try block to prevent any other possible crashes when saving account data.
MatthewL246 · Aug 30, 2022 · 6d72c66 · 6d72c66
1 parent e2f6275
commit 6d72c66
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -501,24 +501,24 @@ private void ReloadOrStop(object sender, RoutedEventArgs e)
         /// <summary>Saves the current account's login info and settings.</summary>
         private async Task SaveAccountDataAsync()
         {
-            JsonObject accountDataObject = new()
+            try
             {
-                ["username"] = username.Text,
-                ["password"] = passwordHash.Password,
+                JsonObject accountDataObject = new()
+                {
+                    ["username"] = username.Text,
+                    ["password"] = passwordHash.Password,
 
-                ["accountServer"] = accountServer.Text,
-                ["discoveryServer"] = discoveryServer.Text,
-                ["portalServer"] = portalServer.Text,
+                    ["accountServer"] = accountServer.Text,
+                    ["discoveryServer"] = discoveryServer.Text,
+                    ["portalServer"] = portalServer.Text,
 
-                ["languageId"] = (int?)languageBox.SelectedItem,
-                ["countryId"] = (int?)countryBox.SelectedItem,
-                ["console"] = (string?)consoleSelect.SelectedItem,
-            };
+                    ["languageId"] = (int)languageBox.SelectedItem,
+                    ["countryId"] = (int)countryBox.SelectedItem,
+                    ["console"] = (string)consoleSelect.SelectedItem,
+                };
 
-            JsonSerializerOptions options = new() { WriteIndented = true };
+                JsonSerializerOptions options = new() { WriteIndented = true };
 
-            try
-            {
                 await File.WriteAllTextAsync(accountDataJsonPath, accountDataObject.ToJsonString(options));
             }
             catch (Exception ex)