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

1 files changed, 12 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/VersionUpdateController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/VersionUpdateController.cs
index b68da06a7..2ad8bd735 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/VersionUpdateController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/VersionUpdateController.cs
@@ -45,9 +45,19 @@ namespace Tango.MachineService.Controllers
 
             using (ObservablesContext db = ObservablesContextHelper.CreateContext())
             {
-                var versions = db.TangoVersions.Where(x => x.MachineVersionGuid == request.MachineVersionGuid).ToList();
+                var versions = db.TangoVersions.ToList();
 
-                if (versions.Count > 0)
+                if (versions.Count == 0)
+                {
+                    return new LatestVersionResponse()
+                    {
+                        Version = "0.0.0.0",
+                    };
+                }
+
+                var machine_versions = versions.Where(x => x.MachineVersionGuid == request.MachineVersionGuid).ToList();
+
+                if (machine_versions.Count > 0)
                 {
                     response.Version = db.TangoVersions.Where(x => x.MachineVersionGuid == request.MachineVersionGuid).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault().Version;
                 }