From 6523b30f105aa4d1568b24501b80811d6e4562bf Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Wed, 16 Dec 2015 20:01:40 +0100
Subject: [PATCH] Always use LoginID, closes #32

---
 ArchiSteamFarm/Bot.cs | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs
index e0211f482..d52e20210 100755
--- a/ArchiSteamFarm/Bot.cs
+++ b/ArchiSteamFarm/Bot.cs
@@ -45,7 +45,6 @@ namespace ArchiSteamFarm {
 
 		private bool LoggedInElsewhere = false;
 		private bool IsRunning = false;
-		private bool IsBeingUsedAsPrimaryAccount = false;
 		private string AuthCode, LoginKey, TwoFactorAuth;
 
 		internal ArchiHandler ArchiHandler { get; private set; }
@@ -542,7 +541,8 @@ namespace ArchiSteamFarm {
 				SteamPassword = Program.GetUserInput(BotName, Program.EUserInputType.Password);
 			}
 
-			SteamUser.LogOnDetails logOnDetails = new SteamUser.LogOnDetails {
+			// TODO: We should use SteamUser.LogOn with proper LoginID once https://github.com/SteamRE/SteamKit/pull/217 gets merged
+			ArchiHandler.HackedLogOn(Program.UniqueID, new SteamUser.LogOnDetails {
 				Username = SteamLogin,
 				Password = SteamPassword,
 				AuthCode = AuthCode,
@@ -550,14 +550,7 @@ namespace ArchiSteamFarm {
 				TwoFactorCode = TwoFactorAuth,
 				SentryFileHash = sentryHash,
 				ShouldRememberPassword = true
-			};
-
-			if (!IsBeingUsedAsPrimaryAccount) {
-				SteamUser.LogOn(logOnDetails);
-			} else {
-				// TODO: We should use SteamUser.LogOn with proper LoginID once https://github.com/SteamRE/SteamKit/pull/217 gets merged
-				ArchiHandler.HackedLogOn(Program.UniqueID, logOnDetails);
-			}
+			});
 		}
 
 		private async void OnDisconnected(SteamClient.DisconnectedCallback callback) {
@@ -712,12 +705,9 @@ namespace ArchiSteamFarm {
 			Logging.LogGenericInfo(BotName, "Logged off of Steam: " + callback.Result);
 
 			switch (callback.Result) {
-				case EResult.LogonSessionReplaced:
-					Logging.LogGenericInfo(BotName, "This is primary account, changing logic alt -> main");
-					IsBeingUsedAsPrimaryAccount = true;
-					break;
 				case EResult.AlreadyLoggedInElsewhere:
 				case EResult.LoggedInElsewhere:
+				case EResult.LogonSessionReplaced:
 					LoggedInElsewhere = true;
 					break;
 			}