1 files changed, 13 insertions, 10 deletions
diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/ViewModels/MainViewVM.cs
index 3bcdc823f..a2a9cf811 100644
--- a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/ViewModels/MainViewVM.cs
@@ -32,6 +32,7 @@ namespace Tango.Stubs.UI.ViewModels
         private UsbTransportAdapter _adapter; //Holds the USB transport adapter.
         private StubManager _stubManager;
         private TextBox _logTextBox;
+        private StubsUISettings _settings;
 
         #region Properties
 
@@ -234,6 +235,8 @@ namespace Tango.Stubs.UI.ViewModels
         /// </summary>
         public MainViewVM()
         {
+            _settings = SettingsManager.Default.GetOrCreate<StubsUISettings>();
+
             Examples = new List<ExampleVM>();
             CodeTabs = new ObservableCollection<CodeTabVM>();
             NewCommand = new RelayCommand(CreateNewTab);
@@ -317,15 +320,15 @@ namespace Tango.Stubs.UI.ViewModels
                 Ports.Add("COM" + i);
             }
 
-            SelectedPort = SettingsManager.Default.StubsUI.SelectedPort != null ? SettingsManager.Default.StubsUI.SelectedPort : Ports.First();
-            BaudRate = (UsbSerialBaudRates)SettingsManager.Default.StubsUI.BaudRate;
-            AppendLogAuto = SettingsManager.Default.StubsUI.AutoLogResponse;
+            SelectedPort = _settings.SelectedPort != null ? _settings.SelectedPort : Ports.First();
+            BaudRate = _settings.BaudRate;
+            AppendLogAuto = _settings.AutoLogResponse;
 
             Status = "Ready";
 
-            if (SettingsManager.Default.StubsUI.LastTabs.Count > 0)
+            if (_settings.LastTabs.Count > 0)
             {
-                foreach (var file in SettingsManager.Default.StubsUI.LastTabs)
+                foreach (var file in _settings.LastTabs)
                 {
                     if (File.Exists(file))
                     {
@@ -754,11 +757,11 @@ namespace Tango.Stubs.UI.ViewModels
 
         private void Current_Exit(object sender, ExitEventArgs e)
         {
-            SettingsManager.Default.StubsUI.AutoLogResponse = AppendLogAuto;
-            SettingsManager.Default.StubsUI.SelectedPort = SelectedPort;
-            SettingsManager.Default.StubsUI.BaudRate = BaudRate.ToInt32();
-            SettingsManager.Default.StubsUI.LastTabs = CodeTabs.Select(x => x.File).ToList();
-            SettingsManager.SaveDefaultSettings();
+            _settings.AutoLogResponse = AppendLogAuto;
+            _settings.SelectedPort = SelectedPort;
+            _settings.BaudRate = BaudRate;
+            _settings.LastTabs = CodeTabs.Select(x => x.File).ToList();
+            _settings.Save();
         }
 
         private void AppendTextLog(String log)