1 files changed, 12 insertions, 7 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
index 4c71c2a1a..088e80f61 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -41,6 +41,7 @@ namespace Tango.PPC.Common.MachineUpdate
         private List<LogItemBase> _logs;
         private System.Timers.Timer _checkForUpdateTimer;
         private bool _isUpdating;
+        private PPCSettings _settings;
 
         #region Events
 
@@ -77,7 +78,7 @@ namespace Tango.PPC.Common.MachineUpdate
         /// <summary>
         /// Gets or sets a value indicating whether to automatically check for new application updates.
         /// </summary>
-        public bool AutoCheckForUpdates
+        public bool EnableAutoCheckForUpdates
         {
             get { return _autoCheckForUpdates; }
             set { _autoCheckForUpdates = value; RaisePropertyChangedAuto(); }
@@ -105,6 +106,8 @@ namespace Tango.PPC.Common.MachineUpdate
             _checkForUpdateTimer = new System.Timers.Timer(TimeSpan.FromMinutes(1).TotalMilliseconds);
             _checkForUpdateTimer.Elapsed += _checkForUpdateTimer_Elapsed;
             _checkForUpdateTimer.Start();
+
+            _settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
         }
 
         #endregion
@@ -421,7 +424,7 @@ namespace Tango.PPC.Common.MachineUpdate
             {
                 _isUpdating = true;
 
-                var machineServiceAddress = SettingsManager.Default.GetOrCreate<PPCSettings>().GetMachineServiceAddress();
+                var machineServiceAddress = _settings.GetMachineServiceAddress();
 
                 LogManager.Log($"Starting machine update for serial number {serialNumber}...");
 
@@ -688,7 +691,7 @@ namespace Tango.PPC.Common.MachineUpdate
             {
                 _isUpdating = true;
 
-                var machineServiceAddress = SettingsManager.Default.GetOrCreate<PPCSettings>().GetMachineServiceAddress();
+                var machineServiceAddress = _settings.GetMachineServiceAddress();
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
 
@@ -702,6 +705,8 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 try
                 {
+                    request.MachineLastUpdated = _machineProvider.Machine.LastUpdated;
+
                     using (ObservablesContext db = ObservablesContext.CreateDefault())
                     {
                         request.Rmls = db.Rmls.ToList().Select(x => new UpdatedEntity(x)).ToList();
@@ -861,7 +866,7 @@ namespace Tango.PPC.Common.MachineUpdate
         {
             return Task.Factory.StartNew<DbCompareResult>(() =>
             {
-                var machineServiceAddress = SettingsManager.Default.GetOrCreate<PPCSettings>().GetMachineServiceAddress();
+                var machineServiceAddress = _settings.GetMachineServiceAddress();
 
                 LogManager.Log($"Checking if database update is required for serial number {serialNumber}...");
 
@@ -1042,7 +1047,7 @@ namespace Tango.PPC.Common.MachineUpdate
                     throw new InvalidOperationException("The specified tup file is invalid. The package was generated for a different machine.");
                 }
 
-                if (publishInfo.MachineDeploymentSlot != SettingsManager.Default.GetOrCreate<PPCSettings>().DeploymentSlot)
+                if (publishInfo.MachineDeploymentSlot != _settings.DeploymentSlot)
                 {
                     throw new InvalidOperationException("The specified tup file is invalid. The package was generated on a different environment.");
                 }
@@ -1292,7 +1297,7 @@ namespace Tango.PPC.Common.MachineUpdate
             String packagesFolder = Path.Combine(AssemblyHelper.GetCurrentAssemblyFolder(), "packages");
 
             Version previousVersion = null;
-            String str = SettingsManager.Default.GetOrCreate<PPCSettings>().PreviousApplicationVersion;
+            String str = _settings.PreviousApplicationVersion;
 
             if (Version.TryParse(str, out previousVersion))
             {
@@ -1333,7 +1338,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
         private async void _checkForUpdateTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
-            if (AutoCheckForUpdates && !_isUpdating)
+            if (EnableAutoCheckForUpdates && _settings.AutoCheckForUpdates && !_isUpdating)
             {
                 _checkForUpdateTimer.Stop();