Fix linking new authenticator with null password

JustArchiNET · May 12, 2016 · fad08a1 · fad08a1
1 parent a180c10
commit fad08a1
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs
@@ -485,7 +485,7 @@ private void ImportAuthenticator(string maFilePath) {
 			// But here we're dealing with WinAuth authenticator
 			Logging.LogGenericInfo("ASF requires a few more steps to complete authenticator import...", BotName);
 
-			if (!InitializeLoginAndPassword()) {
+			if (!InitializeLoginAndPassword(true)) {
 				BotDatabase.SteamGuardAccount = null;
 				return;
 			}
@@ -1289,7 +1289,7 @@ private void LinkMobileAuthenticator() {
 
 			Logging.LogGenericInfo("Linking new ASF MobileAuthenticator...", BotName);
 
-			if (!InitializeLoginAndPassword()) {
+			if (!InitializeLoginAndPassword(true)) {
 				return;
 			}
 
@@ -1382,15 +1382,15 @@ private void JoinMasterChat() {
 			SteamFriends.JoinChat(BotConfig.SteamMasterClanID);
 		}
 
-		private bool InitializeLoginAndPassword() {
+		private bool InitializeLoginAndPassword(bool requiresPassword) {
 			if (string.IsNullOrEmpty(BotConfig.SteamLogin)) {
 				BotConfig.SteamLogin = Program.GetUserInput(Program.EUserInputType.Login, BotName);
 				if (string.IsNullOrEmpty(BotConfig.SteamLogin)) {
 					return false;
 				}
 			}
 
-			if (string.IsNullOrEmpty(BotConfig.SteamPassword) && string.IsNullOrEmpty(BotDatabase.LoginKey)) {
+			if (string.IsNullOrEmpty(BotConfig.SteamPassword) && (requiresPassword || string.IsNullOrEmpty(BotDatabase.LoginKey))) {
 				BotConfig.SteamPassword = Program.GetUserInput(Program.EUserInputType.Password, BotName);
 				if (string.IsNullOrEmpty(BotConfig.SteamPassword)) {
 					return false;
@@ -1428,7 +1428,7 @@ private void OnConnected(SteamClient.ConnectedCallback callback) {
 				}
 			}
 
-			if (!InitializeLoginAndPassword()) {
+			if (!InitializeLoginAndPassword(false)) {
 				Stop();
 				return;
 			}