merge

1 files changed, 21 insertions, 0 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 0bbcfd313..4c02be2b2 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -42,6 +42,22 @@ namespace Tango.MachineStudio.UI.StudioApplication
             _moduleLoader = moduleLoader;
             _navigationManager = navigationManager;
             _openedWindows = new List<Window>();
+
+            Task.Factory.StartNew(() => 
+            {
+                while (MainWindow.Instance == null)
+                {
+                    Thread.Sleep(100);
+                }
+
+                InvokeUI(() => 
+                {
+                    MainWindow.Instance.ContentRendered += (_, __) =>
+                    {
+                        TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>().ToList().ForEach(x => x.OnApplicationStarted());
+                    };
+                });
+            });
         }
 
         /// <summary>
@@ -229,6 +245,11 @@ namespace Tango.MachineStudio.UI.StudioApplication
             }
         }
 
+        /// <summary>
+        /// Notify the application manager about an external opened window.
+        /// When application exists. All registered windows will be closed.
+        /// </summary>
+        /// <param name="window">The window.</param>
         public void RegisterOpenedWindow(Window window)
         {
             _openedWindows.Add(window);