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

1 files changed, 5 insertions, 45 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..283ea3637 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();
@@ -88,48 +91,6 @@ namespace Tango.MachineStudio.UI.ViewModels
                 {
                     try
                     {
-                        Status = "Checking for critical updates...";
-
-                        LogManager.Log("Checking for forced update...");
-                        var service = UpdateServiceHelper.GetUpdateServiceChannel();
-                        var client = service.CreateChannel();
-
-                        CheckForUpdatesResponse response = client.CheckForUpdates(new CheckForUpdatesRequest()
-                        {
-                            Email = "ForceUpdate",
-                            Password = "ForceUpdate",
-                            Version = ApplicationManager.Version.ToString(),
-                        });
-
-                        if (response.IsUpdateAvailable && response.ForcedUpdate)
-                        {
-                            LogManager.Log("Forced update found, Navigating to update view!");
-
-                            InvokeUI(() =>
-                            {
-                                if (_notificationProvider.ShowQuestion("Machine Studio has detected a critical update which must be installed in order for the application to run properly. Do you wish to download and install this update?"))
-                                {
-                                    TangoMessenger.Default.Send(new Messages.ForcedUpdateMessage() { UpdateResponse = response });
-                                    _navigationManager.NavigateTo(NavigationView.UpdateView);
-                                }
-                                else
-                                {
-                                    ApplicationManager.ShutDown();
-                                }
-
-                                IsLoading = false;
-                            });
-
-                            return;
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        LogManager.Log(ex, "Error checking for forced update!");
-                    }
-
-                    try
-                    {
                         Status = "Connecting to Team Foundation Services...";
                         _tfs.Initialize();
                         Thread.Sleep(500);
@@ -141,9 +102,8 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                     Status = "Loading, please wait...";
 
-                    ObservablesStaticCollections.Instance.Initialize();
-
-                    _eventLogger.Log(EventTypes.ApplicationStarted, "Application Started!");
+                    //ObservablesStaticCollections.Instance.Initialize();
+                    //_eventLogger.Log(EventTypes.ApplicationStarted, "Application Started!");
 
                     Status = "Starting application...";