From 953103719cd8628fac620fb15738ce3612cff713 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Wed, 9 Aug 2017 00:18:38 +0200 Subject: [PATCH] Misc --- ArchiSteamFarm/Bot.cs | 2 +- ArchiSteamFarm/Program.cs | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs index 5a4bfc37d..bb270f256 100755 --- a/ArchiSteamFarm/Bot.cs +++ b/ArchiSteamFarm/Bot.cs @@ -1278,7 +1278,7 @@ namespace ArchiSteamFarm { return; } - ArchiLogger.LogGenericError(Strings.BotHeartBeatFailed); + ArchiLogger.LogGenericWarning(Strings.BotHeartBeatFailed); Destroy(true); RegisterBot(BotName); } diff --git a/ArchiSteamFarm/Program.cs b/ArchiSteamFarm/Program.cs index 9f1aeb0bf..2e0e44d41 100644 --- a/ArchiSteamFarm/Program.cs +++ b/ArchiSteamFarm/Program.cs @@ -325,22 +325,23 @@ namespace ArchiSteamFarm { ShutdownSequenceInitialized = true; - if (Bot.Bots.Count == 0) { - return true; - } + if (Bot.Bots.Count > 0) { + IEnumerable tasks = Bot.Bots.Values.Select(bot => Task.Run(() => bot.Stop(false))); - IEnumerable tasks = Bot.Bots.Values.Select(bot => Task.Run(() => bot.Stop(false))); + switch (GlobalConfig.OptimizationMode) { + case GlobalConfig.EOptimizationMode.MinMemoryUsage: + foreach (Task task in tasks) { + await Task.WhenAny(task, Task.Delay(WebBrowser.MaxTries * 1000)).ConfigureAwait(false); + } - switch (GlobalConfig.OptimizationMode) { - case GlobalConfig.EOptimizationMode.MinMemoryUsage: - foreach (Task task in tasks) { - await Task.WhenAny(task, Task.Delay(WebBrowser.MaxTries * 1000)).ConfigureAwait(false); - } + break; + default: + await Task.WhenAny(Task.WhenAll(tasks), Task.Delay(Bot.Bots.Count * WebBrowser.MaxTries * 1000)).ConfigureAwait(false); + break; + } - break; - default: - await Task.WhenAny(Task.WhenAll(tasks), Task.Delay(Bot.Bots.Count * WebBrowser.MaxTries * 1000)).ConfigureAwait(false); - break; + // Extra second for Steam requests to go through + await Task.Delay(1000).ConfigureAwait(false); } LogManager.Flush();