2 files changed, 20 insertions, 2 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 f50b734f4..6505bcf88 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
@@ -31,7 +31,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             StaThreadHelper.StartStaThread(() =>
             {
-                Thread.Sleep(3000);
+                Thread.Sleep(1000);
                 try
                 {
                     ObservablesEntitiesAdapter.Instance.Initialize();
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 7ef47fabd..a12156d60 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -26,6 +26,15 @@ namespace Tango.MachineStudio.UI.ViewModels
             set { _currentModule = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _isModuleLoaded;
+
+        public bool IsModuleLoaded
+        {
+            get { return _isModuleLoaded; }
+            set { _isModuleLoaded = value; RaisePropertyChangedAuto(); }
+        }
+
+
         private bool _isMenuOpened;
 
         public bool IsMenuOpened
@@ -85,7 +94,16 @@ namespace Tango.MachineStudio.UI.ViewModels
         private void StartModule(IStudioModule module)
         {
             IsMenuOpened = false;
-            CurrentModule = module;
+
+            if (module != null)
+            {
+                CurrentModule = module;
+                IsModuleLoaded = true;
+            }
+            else
+            {
+                IsModuleLoaded = false;
+            }
         }
 
         protected override void OnViewAttached()