Prevent a crash when accessing Preferences in Settings

Author: lukeblevins

Files/SettingsPages/Preferences.xaml.cs

@@ -25,7 +25,7 @@ public Preferences()
         {
             this.InitializeComponent();
 
-            if (App.AppSettings != null)
+            if (App.AppSettings != null && localSettings.Values["customLocationsSetting"] != null)
             {
                 if (localSettings.Values["customLocationsSetting"].Equals(true))
                 {
@@ -90,10 +90,6 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             base.OnNavigatedTo(e);
 
-            var terminals = App.AppSettings.Terminals;
-
-            foreach (var terminal in terminals) App.AppSettings.Terminals.Add(terminal);
-
             var terminalId = 1;
             if (localSettings.Values["terminal_id"] != null) terminalId = (int) localSettings.Values["terminal_id"];
 

Files/View Models/SettingsViewModel.cs

@@ -31,10 +31,10 @@ public SettingsViewModel()
             DetectApplicationTheme();
             DetectDateTimeFormat();
             DetectSidebarOpacity();
-
             DrivesManager = new DrivesManager();
 
             foundDrives = DrivesManager.Drives;
+            LoadTerminalApps();
         }
 
         private void DetectSidebarOpacity()