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

2 files changed, 17 insertions, 11 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/LocalSynchronizationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/LocalSynchronizationViewVM.cs
index d3cb23d64..879f6e493 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/LocalSynchronizationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/LocalSynchronizationViewVM.cs
@@ -33,6 +33,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
         private INotificationProvider _notification;
         private bool _isWorking;
         private MainViewVM _mainView;
+        private SynchronizationModuleSettings _settings;
 
         #region Constructors
 
@@ -43,6 +44,8 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
         /// <param name="notification">The notification.</param>
         public LocalSynchronizationViewVM(SyncNavigationManager navigation, INotificationProvider notification)
         {
+            _settings = SettingsManager.Default.GetOrCreate<SynchronizationModuleSettings>();
+
             _navigation = navigation;
             _notification = notification;
 
@@ -57,15 +60,15 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             CommitAllCommand = new RelayCommand(CommitAll, (x) => Differences.Count > 0 && !_isWorking);
             CleanCommand = new RelayCommand(CleanSlave, (x) => !_isWorking && SlaveDBFile != null);
 
-            if (File.Exists(SettingsManager.Default.MachineStudio.SynchronizationModule.LocalMasterDBFile))
+            if (File.Exists(_settings.LocalMasterDBFile))
             {
-                MasterDBFile = SettingsManager.Default.MachineStudio.SynchronizationModule.LocalMasterDBFile;
+                MasterDBFile = _settings.LocalMasterDBFile;
                 MasterDBName = Path.GetFileName(MasterDBFile);
             }
 
-            if (File.Exists(SettingsManager.Default.MachineStudio.SynchronizationModule.LocalSlaveDBFile))
+            if (File.Exists(_settings.LocalSlaveDBFile))
             {
-                SlaveDBFile = SettingsManager.Default.MachineStudio.SynchronizationModule.LocalSlaveDBFile;
+                SlaveDBFile = _settings.LocalSlaveDBFile;
                 SlaveDBName = Path.GetFileName(SlaveDBFile);
             }
         }
@@ -268,9 +271,9 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
                         SelectedDifference = null;
                         InvalidateRelayCommands();
 
-                        SettingsManager.Default.MachineStudio.SynchronizationModule.LocalMasterDBFile = MasterDBFile;
-                        SettingsManager.Default.MachineStudio.SynchronizationModule.LocalSlaveDBFile = SlaveDBFile;
-                        SettingsManager.SaveDefaultSettings();
+                        _settings.LocalMasterDBFile = MasterDBFile;
+                        _settings.LocalSlaveDBFile = SlaveDBFile;
+                        _settings.Save();
                     }
                 }
             });
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs
index 75b5fe95a..2896f3e58 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs
@@ -41,6 +41,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
         private RemoteDB _remoteDB;
         private LocalDB _localDB;
         private MainViewVM _mainView;
+        private SynchronizationModuleSettings _settings;
 
         #region Constructors
 
@@ -51,6 +52,8 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
         /// <param name="notification">The notification.</param>
         public RemoteSynchronizationViewVM(SyncNavigationManager navigation, INotificationProvider notification)
         {
+            _settings = SettingsManager.Default.GetOrCreate<SynchronizationModuleSettings>();
+
             _navigation = navigation;
             _notification = notification;
 
@@ -64,9 +67,9 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
             CommitAllCommand = new RelayCommand(CommitAll, (x) => Differences.Count > 0 && !_isWorking && SelectedMachine != null);
             CleanCommand = new RelayCommand(CleanSlave, (x) => !_isWorking && SlaveDBFile != null);
 
-            if (File.Exists(SettingsManager.Default.MachineStudio.SynchronizationModule.RemoteSQLiteFile))
+            if (File.Exists(_settings.RemoteSQLiteFile))
             {
-                SlaveDBFile = SettingsManager.Default.MachineStudio.SynchronizationModule.RemoteSQLiteFile;
+                SlaveDBFile = _settings.RemoteSQLiteFile;
                 SlaveDBName = Path.GetFileName(SlaveDBFile);
             }
         }
@@ -266,8 +269,8 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
                         SelectedDifference = null;
                         InvalidateRelayCommands();
 
-                        SettingsManager.Default.MachineStudio.SynchronizationModule.RemoteSQLiteFile = SlaveDBFile;
-                        SettingsManager.SaveDefaultSettings();
+                        _settings.RemoteSQLiteFile = SlaveDBFile;
+                        _settings.Save();
                     }
                 }
             });