Some more work on FSE..

1 files changed, 24 insertions, 2 deletions

diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/ViewModels/LoadingViewVM.cs
index ec6042046..3438b3670 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/ViewModels/LoadingViewVM.cs
@@ -14,6 +14,13 @@ namespace Tango.FSE.UI.ViewModels
 {
     public class LoadingViewVM : FSEViewModel
     {
+        private bool _isLoading;
+        public bool IsLoading
+        {
+            get { return _isLoading; }
+            set { _isLoading = value; RaisePropertyChangedAuto(); }
+        }
+
         public LoadingViewVM()
         {
 
@@ -21,8 +28,23 @@ namespace Tango.FSE.UI.ViewModels
 
         public async override void OnApplicationStarted()
         {
-            await GatewayService.GetEnvironments();
-            await NavigationManager.NavigateTo(NavigationView.LoginView);
+            try
+            {
+                IsLoading = true;
+                await Task.Delay(1000);
+                await GatewayService.GetEnvironments();
+                await NavigationManager.NavigateTo(NavigationView.LoginView);
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error retrieving environments from gateway.");
+                await NotificationProvider.ShowError("Error retrieving environments from gateway.");
+                ApplicationManager.ShutDown();
+            }
+            finally
+            {
+                IsLoading = false;
+            }
         }
 
         public override void OnApplicationReady()