merge, no change

1 files changed, 12 insertions, 7 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index a2c761824..6f5eed749 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -204,16 +204,19 @@ namespace Tango.MachineService.Controllers
                     throw new AuthenticationException("The specified serial number could not be found.");
                 }
 
-                var machine_version = db.MachineVersions.SingleOrDefault(x => x.Guid == machine.MachineVersionGuid);
+                if (!machine.SuspendVersionUpdate)
+                {
+                    var machine_version = db.MachineVersions.SingleOrDefault(x => x.Guid == machine.MachineVersionGuid);
 
-                var latest_machine_version = db.TangoVersions.Where(x => x.MachineVersionGuid == machine_version.Guid).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
+                    var latest_machine_version = db.TangoVersions.Where(x => x.MachineVersionGuid == machine_version.Guid).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
 
-                if (Version.Parse(latest_machine_version.Version) > Version.Parse(request.Version))
-                {
-                    response.IsUpdateAvailable = true;
-                }
+                    if (Version.Parse(latest_machine_version.Version) > Version.Parse(request.Version))
+                    {
+                        response.IsUpdateAvailable = true;
+                    }
 
-                response.Version = latest_machine_version.Version;
+                    response.Version = latest_machine_version.Version;
+                }
             }
 
             return response;
@@ -237,6 +240,8 @@ namespace Tango.MachineService.Controllers
                     throw new AuthenticationException("The specified serial number could not be found.");
                 }
 
+                response.PerformSchemaUpdate = machine.PerformSchemaUpdateOnDataUpdate;
+
                 DbCredentials credentials = new DbCredentials();
 
                 using (SmoManager manager = new SmoManager())