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

1 files changed, 12 insertions, 3 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
index a33dc25d7..20752ac71 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.BL;
 using Tango.Core;
 using Tango.Core.Helpers;
 using Tango.PPC.Common;
@@ -19,9 +20,17 @@ namespace Tango.PPC.UI.ViewModels
     {
         public async override void OnApplicationStarted()
         {
-            await Task.Delay(500);
-            NavigationManager.NavigateTo(NavigationView.LayoutView);
-            NavigationManager.NavigateTo(NavigationView.JobsView);
+            await Task.Factory.StartNew(() =>
+            {
+                ObservablesEntitiesAdapter.Instance.Initialize();
+            });
+
+            ApplicationManager.ModulesInitialized += (_, __) =>
+            {
+                NavigationManager.NavigateTo(NavigationView.LayoutView);
+            };
+
+            await AuthenticationProvider.Login("roy@twine-s.com", "1234");
         }
     }
 }