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

1 files changed, 17 insertions, 0 deletions

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 4ebf3d96d..c8e25e2d4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
@@ -87,6 +87,17 @@ namespace Tango.MachineStudio.UI.ViewModels
             set { _rememberMe = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _enableSlotSelection;
+        /// <summary>
+        /// Gets or sets a value indicating whether to enable the deployment slot selection.
+        /// </summary>
+        public bool EnableSlotSelection
+        {
+            get { return _enableSlotSelection; }
+            set { _enableSlotSelection = value; RaisePropertyChangedAuto(); }
+        }
+
+
         /// <summary>
         /// Gets or sets the login command.
         /// </summary>
@@ -100,6 +111,8 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// <param name="notificationProvider">The notification provider.</param>
         public LoginViewVM(IAuthenticationProvider authenticationProvider, INavigationManager navigationManager, INotificationProvider notificationProvider, IEventLogger eventLogger)
         {
+            EnableSlotSelection = true;
+
             _settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
 
             _notificationProvider = notificationProvider;
@@ -137,6 +150,8 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                     await Task.Factory.StartNew(() =>
                     {
+                        
+
                         _settings.DeploymentSlot = DeploymentSlot;
 
                         _authenticationProvider.Login(Email, Password);
@@ -151,6 +166,8 @@ namespace Tango.MachineStudio.UI.ViewModels
                         _settings.Save();
 
                         _eventLogger.Log("User logged in.");
+
+                        EnableSlotSelection = false;
                     });
                 }
                 catch (Exception ex)