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

1 files changed, 11 insertions, 0 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 7d83fa032..9ee8471ec 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
@@ -28,6 +28,14 @@ namespace Tango.MachineStudio.UI.ViewModels
         private LogManager logManager = LogManager.Default;
         public IStudioApplicationManager ApplicationManager { get; set; }
 
+        private bool _isLoading;
+
+        public bool IsLoading
+        {
+            get { return _isLoading; }
+            set { _isLoading = value; RaisePropertyChangedAuto(); }
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="LoadingViewVM"/> class.
         /// </summary>
@@ -48,6 +56,8 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// </summary>
         private void Load()
         {
+            IsLoading = true;
+
             ThreadsHelper.StartStaThread(() =>
             {
                 try
@@ -57,6 +67,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                     {
                         _studioModuleLoader.LoadModules();
                         _navigationManager.NavigateTo(NavigationView.LoginView);
+                        IsLoading = false;
                     });
                 }
                 catch (Exception ex)