MERGE!

1 files changed, 8 insertions, 1 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 55a54e8aa..9acf26afd 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs
@@ -6,9 +6,11 @@ using System.Threading;
 using System.Threading.Tasks;
 using Tango.Core.Helpers;
 using Tango.Integration.Observables;
+using Tango.Logging;
 using Tango.MachineStudio.Common.Modules;
 using Tango.MachineStudio.Common.Navigation;
 using Tango.MachineStudio.Common.Notifications;
+using Tango.MachineStudio.Common.StudioApplication;
 using Tango.SharedUI;
 
 namespace Tango.MachineStudio.UI.ViewModels
@@ -23,14 +25,17 @@ namespace Tango.MachineStudio.UI.ViewModels
         private INavigationManager _navigationManager;
         private IStudioModuleLoader _studioModuleLoader;
 
+        public IStudioApplicationManager ApplicationManager { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="LoadingViewVM"/> class.
         /// </summary>
         /// <param name="navigationManager">The navigation manager.</param>
         /// <param name="studioModuleLoader">The studio module loader.</param>
         /// <param name="notificationProvider">The notification provider.</param>
-        public LoadingViewVM(INavigationManager navigationManager, IStudioModuleLoader studioModuleLoader, INotificationProvider notificationProvider)
+        public LoadingViewVM(IStudioApplicationManager applicationManager, INavigationManager navigationManager, IStudioModuleLoader studioModuleLoader, INotificationProvider notificationProvider)
         {
+            ApplicationManager = applicationManager;
             _navigationManager = navigationManager;
             _studioModuleLoader = studioModuleLoader;
             _notificationProvider = notificationProvider;
@@ -55,6 +60,8 @@ namespace Tango.MachineStudio.UI.ViewModels
                 }
                 catch (Exception ex)
                 {
+                    LogManager.Log(ex);
+
                     InvokeUINow(() =>
                     {
                         if (_notificationProvider.ShowQuestion("An error occurred while trying to connect to Twine database." + Environment.NewLine + "Would you like to try again?"))