1 files changed, 21 insertions, 2 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 e98f6d717..5296a9f34 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Tango.BL;
 using Tango.Core;
 using Tango.Core.DB;
 using Tango.Core.ExtensionMethods;
@@ -594,6 +595,8 @@ namespace Tango.PPC.Common.MachineUpdate
         {
             return Task.Factory.StartNew<CheckForUpdateResponse>(() =>
             {
+                _isUpdating = true;
+
                 var machineServiceAddress = SettingsManager.Default.GetOrCreate<PPCSettings>().GetMachineServiceAddress();
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
@@ -606,12 +609,28 @@ namespace Tango.PPC.Common.MachineUpdate
                 request.SerialNumber = serialNumber;
                 request.Version = _app_manager.Version.ToString();
 
+                try
+                {
+                    using (ObservablesContext db = ObservablesContext.CreateDefault())
+                    {
+                        request.Rmls = db.Rmls.ToList().Select(x => new UpdatedEntity(x)).ToList();
+                        request.HardwareVersions = db.HardwareVersions.ToList().Select(x => new UpdatedEntity(x)).ToList();
+                        request.Catalogs = db.ColorCatalogs.ToList().Select(x => new UpdatedEntity(x)).ToList();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "An error occurred while trying to fill the existing database entities before checking for updates.");
+                }
+
                 CheckForUpdateResponse update_response = null;
 
                 update_response = _client.CheckForUpdates(request).Result;
 
                 LogManager.Log($"Check for update response received: {Environment.NewLine}{update_response.ToJsonString()}");
 
+                _isUpdating = false;
+
                 return update_response;
             });
         }
@@ -977,10 +996,10 @@ namespace Tango.PPC.Common.MachineUpdate
                 try
                 {
                     var response = await CheckForUpdate(_machineProvider.Machine.SerialNumber);
-                    if (response.IsUpdateAvailable)
+                    if (response.IsUpdateAvailable || response.IsDatabaseUpdateAvailable)
                     {
                         _checkForUpdateTimer.Interval = TimeSpan.FromMinutes(60).TotalMilliseconds;
-                        LogManager.Log($"New application version detected ({response.Version}). Raising event...");
+                        LogManager.Log($"New {(response.IsDatabaseUpdateAvailable ? "database updates" : "application version")} detected ({response.Version}). Raising event...");
                         UpdateAvailable?.Invoke(this, response);
                     }
                 }