Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 8 insertions, 5 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs
index df47273d0..afd5e4d70 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs
@@ -30,6 +30,7 @@ namespace Tango.MachineStudio.Stubs.ViewModels
         private UsbTransportAdapter _adapter; //Holds the USB transport adapter.
         private StubManager _stubManager;
         private INotificationProvider _notification;
+        private StubsModuleSettings _settings;
 
         #region Properties
 
@@ -220,6 +221,8 @@ namespace Tango.MachineStudio.Stubs.ViewModels
         /// </summary>
         public MainViewVM(IStudioApplicationManager applicationManager, INotificationProvider notification)
         {
+            _settings = SettingsManager.Default.GetOrCreate<StubsModuleSettings>();
+
             ApplicationManager = applicationManager;
             _notification = notification;
 
@@ -264,13 +267,13 @@ namespace Tango.MachineStudio.Stubs.ViewModels
                 "COM9",
             };
 
-            SelectedPort = SettingsManager.Default.MachineStudio.StubsModule.SelectedPort != null ? SettingsManager.Default.MachineStudio.StubsModule.SelectedPort : Ports.First();
+            SelectedPort = _settings.SelectedPort != null ? _settings.SelectedPort : Ports.First();
 
             Status = "Ready";
 
-            if (SettingsManager.Default.MachineStudio.StubsModule.LastTabs.Count > 0)
+            if (_settings.LastTabs.Count > 0)
             {
-                foreach (var file in SettingsManager.Default.MachineStudio.StubsModule.LastTabs)
+                foreach (var file in _settings.LastTabs)
                 {
                     if (File.Exists(file))
                     {
@@ -534,8 +537,8 @@ namespace Tango.MachineStudio.Stubs.ViewModels
         /// <returns></returns>
         public override void OnShuttingDown()
         {
-            SettingsManager.Default.MachineStudio.StubsModule.SelectedPort = SelectedPort;
-            SettingsManager.Default.MachineStudio.StubsModule.LastTabs = CodeTabs.Select(x => x.File).ToList();
+            _settings.SelectedPort = SelectedPort;
+            _settings.LastTabs = CodeTabs.Select(x => x.File).ToList();
         }
 
         #endregion