Working on new Machine Studio DB.

1 files changed, 8 insertions, 14 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index ee9337eb3..b8e6e1670 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -43,21 +43,10 @@ namespace Tango.MachineStudio.UI.StudioApplication
             _navigationManager = navigationManager;
             _openedWindows = new List<Window>();
 
-            Task.Factory.StartNew(() =>
+            Application.Current.MainWindow.ContentRendered += (_, __) => 
             {
-                while (MainWindow.Instance == null)
-                {
-                    Thread.Sleep(100);
-                }
-
-                InvokeUI(() =>
-                {
-                    MainWindow.Instance.ContentRendered += (_, __) =>
-                    {
-                        TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>().ToList().ForEach(x => x.OnApplicationStarted());
-                    };
-                });
-            });
+                TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>().ToList().ForEach(x => x.OnApplicationStarted());
+            };
         }
 
         /// <summary>
@@ -305,5 +294,10 @@ namespace Tango.MachineStudio.UI.StudioApplication
                 return EmbeddedResourceHelper.GetEmbeddedResourceText("Tango.MachineStudio.UI.ChangeLog.txt");
             }
         }
+
+        public void NotifyApplicationReady()
+        {
+            TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>().ToList().ForEach(x => x.OnApplicationReady());
+        }
     }
 }