merge

4 files changed, 7 insertions, 10 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
index 4acc76c25..19192020e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -54,6 +54,7 @@ namespace Tango.MachineStudio.UI.Authentication
         {
             var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
 
+
             IWebTransportClient service = new WebTransportClient();
             var response = service.PostJson<LoginRequest, LoginResponse>(settings.MachineServiceAddress + "/api/MachineStudio/Login", new LoginRequest()
             {
@@ -65,7 +66,10 @@ namespace Tango.MachineStudio.UI.Authentication
 
             AccessToken = response.Token;
 
-            ObservablesContext.OverrideSettingsDataSource(response.DataSource);
+            if (settings.Environment == MachineStudioSettings.WorkingEnvironment.Remote)
+            {
+                ObservablesContext.OverrideSettingsDataSource(response.DataSource);
+            }
 
             ObservablesStaticCollections.Instance.Initialize();
 
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 ccedde974..baa550017 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -26,7 +26,6 @@ using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.UI.Views;
 using Tango.Integration.Operation;
 using Tango.MachineStudio.UI.Windows;
-using Tango.MachineStudio.Common.JobRunsLogging;
 
 namespace Tango.MachineStudio.UI.StudioApplication
 {
@@ -40,7 +39,6 @@ namespace Tango.MachineStudio.UI.StudioApplication
         private INavigationManager _navigationManager;
         private IStudioModuleLoader _moduleLoader;
         private INotificationProvider _notification;
-        private IJobRunsLogger _jobRunsLogger;
         private List<Window> _openedWindows;
         private List<IStudioViewModel> _notified_view_models;
 
@@ -53,9 +51,8 @@ namespace Tango.MachineStudio.UI.StudioApplication
         /// Initializes a new instance of the <see cref="DefaultStudioApplicationManager" /> class.
         /// </summary>
         /// <param name="navigationManager">The navigation manager.</param>
-        public DefaultStudioApplicationManager(INavigationManager navigationManager, IStudioModuleLoader moduleLoader, INotificationProvider notification, IJobRunsLogger jobRunsLogger)
+        public DefaultStudioApplicationManager(INavigationManager navigationManager, IStudioModuleLoader moduleLoader, INotificationProvider notification)
         {
-            _jobRunsLogger = jobRunsLogger;
             _moduleLoader = moduleLoader;
             _navigationManager = navigationManager;
             _notification = notification;
@@ -350,7 +347,6 @@ namespace Tango.MachineStudio.UI.StudioApplication
             });
 
             ApplicationReady?.Invoke(this, new EventArgs());
-            _jobRunsLogger.Init(this);
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
index cac4ee0c0..3c548855d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
@@ -8,7 +8,6 @@ using Tango.MachineStudio.Common.Diagnostics;
 using Tango.MachineStudio.Common.EventLogging;
 using Tango.MachineStudio.Common.FirmwareUpgrade;
 using Tango.MachineStudio.Common.Html;
-using Tango.MachineStudio.Common.JobRunsLogging;
 using Tango.MachineStudio.Common.Modules;
 using Tango.MachineStudio.Common.Navigation;
 using Tango.MachineStudio.Common.Notifications;
@@ -71,7 +70,6 @@ namespace Tango.MachineStudio.UI
             TangoIOC.Default.Unregister<IHtmlPresenter>();
             TangoIOC.Default.Unregister<ITeamFoundationServiceClient>();
             TangoIOC.Default.Unregister<IDispatcherProvider>();
-            TangoIOC.Default.Unregister<IJobRunsLogger>();
             TangoIOC.Default.Unregister<IFirmwareUpgrader>();
 
 
@@ -80,7 +78,6 @@ namespace Tango.MachineStudio.UI
             TangoIOC.Default.Register<IAuthenticationProvider, DefaultAuthenticationProvider>();
             TangoIOC.Default.Register<INavigationManager, DefaultNavigationManager>();
             TangoIOC.Default.Register<IStudioModuleLoader, DefaultStudioModuleLoader>();
-            TangoIOC.Default.Register<IJobRunsLogger, DefaultJobRunsLogger>();
             TangoIOC.Default.Register<IStudioApplicationManager, DefaultStudioApplicationManager>();
             TangoIOC.Default.Register<ExternalBridgeScanner, ExternalBridgeScanner>();
             TangoIOC.Default.Register<IVideoCaptureProvider, DefaultVideoCaptureProvider>();
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
index 59cc69a57..730027a67 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
@@ -139,7 +139,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                 catch (Exception ex)
                 {
                     LogManager.Log(ex, "Login Error.");
-                    _notificationProvider.ShowError($"The specified email or password was incorrect, or you don't have a permission to run this application.\nError: {ex.Message}");
+                    _notificationProvider.ShowError($"The specified email or password was incorrect, or you don't have a permission to run this application.\nError: {ex.FlattenMessage()}");
                 }
                 finally
                 {