merge

1 files changed, 5 insertions, 1 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();