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

1 files changed, 6 insertions, 3 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
index 4032c946c..545d51ef2 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
@@ -69,6 +69,9 @@ namespace Tango.MachineStudio.UI.ViewModels
             _notificationProvider = notificationProvider;
         }
 
+        /// <summary>
+        /// Called when the application has been started
+        /// </summary>
         public override void OnApplicationStarted()
         {
             base.OnApplicationStarted();
@@ -91,15 +94,15 @@ namespace Tango.MachineStudio.UI.ViewModels
                         Status = "Checking for critical updates...";
 
                         LogManager.Log("Checking for forced update...");
-                        var service = UpdateServiceHelper.GetUpdateServiceChannel();
-                        var client = service.CreateChannel();
+
+                        var client = new MachineStudioUpdateService();
 
                         CheckForUpdatesResponse response = client.CheckForUpdates(new CheckForUpdatesRequest()
                         {
                             Email = "ForceUpdate",
                             Password = "ForceUpdate",
                             Version = ApplicationManager.Version.ToString(),
-                        });
+                        }).Result;
 
                         if (response.IsUpdateAvailable && response.ForcedUpdate)
                         {