diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs index 9c1a583b0..7a950925e 100755 --- a/ArchiSteamFarm/Bot.cs +++ b/ArchiSteamFarm/Bot.cs @@ -952,7 +952,10 @@ namespace ArchiSteamFarm { ArchiLogger.LogGenericInfo(Strings.BotAutomaticIdlingPauseTimeout); StopFamilySharingInactivityTimer(); - await CardsFarmer.Resume(false).ConfigureAwait(false); + + if (!await CardsFarmer.Resume(false).ConfigureAwait(false)) { + ResetGamesPlayed(); + } } private async Task CheckOccupationStatus() { @@ -967,7 +970,10 @@ namespace ArchiSteamFarm { ArchiLogger.LogGenericInfo(Strings.BotAccountFree); PlayingWasBlocked = false; - await CardsFarmer.Resume(false).ConfigureAwait(false); + + if (!await CardsFarmer.Resume(false).ConfigureAwait(false)) { + ResetGamesPlayed(); + } } private async Task Connect(bool force = false) { diff --git a/ArchiSteamFarm/CardsFarmer.cs b/ArchiSteamFarm/CardsFarmer.cs index 181ce216b..4a736bc8c 100755 --- a/ArchiSteamFarm/CardsFarmer.cs +++ b/ArchiSteamFarm/CardsFarmer.cs @@ -178,11 +178,11 @@ namespace ArchiSteamFarm { await StopFarming().ConfigureAwait(false); } - internal async Task Resume(bool userAction) { + internal async Task Resume(bool userAction) { if (StickyPause) { if (!userAction) { Bot.ArchiLogger.LogGenericInfo(Strings.IgnoredStickyPauseEnabled); - return; + return false; } StickyPause = false; @@ -191,10 +191,11 @@ namespace ArchiSteamFarm { Paused = false; if (NowFarming || (!userAction && !ShouldResumeFarming)) { - return; + return false; } await StartFarming().ConfigureAwait(false); + return true; } internal void SetInitialState(bool paused) => StickyPause = Paused = paused; diff --git a/CodeStyle.vssettings b/CodeStyle.vssettings index a6d58c921..87d1e1077 100644 --- a/CodeStyle.vssettings +++ b/CodeStyle.vssettings @@ -1,4 +1,4 @@ -4truetruetruetrue2truetruetruefalsefalsetruetruetruetruetruetrue58falsetrue4truetruetruetrue<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" />0111<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="false" DiagnosticSeverity="Info" /><CodeStyleOption SerializationVersion="1" Type="Boolean" Value="false" DiagnosticSeverity="Info" /><CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" />11<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" /><CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" /><CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" />01<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" />10111<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" />0100111<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" />10000<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" /><CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" /><CodeStyleOption SerializationVersion="1" Type="Boolean" Value="false" DiagnosticSeverity="Info" />01110<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="false" DiagnosticSeverity="Info" /><NamingPreferencesInfo SerializationVersion="4"> +4truetruetruetrue2truetruetruefalsefalsetruetruetruetruetruetrue58falsetrue4truetruetruetrue<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" />0111<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="false" DiagnosticSeverity="Info" /><CodeStyleOption SerializationVersion="1" Type="Boolean" Value="false" DiagnosticSeverity="Info" /><CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" />11<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" /><CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" /><CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" />01<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" />10111<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" />0000111<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" />10000<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" /><CodeStyleOption SerializationVersion="1" Type="Boolean" Value="true" DiagnosticSeverity="Info" /><CodeStyleOption SerializationVersion="1" Type="Boolean" Value="false" DiagnosticSeverity="Info" />01110<CodeStyleOption SerializationVersion="1" Type="Boolean" Value="false" DiagnosticSeverity="Info" /><NamingPreferencesInfo SerializationVersion="4"> <SymbolSpecifications> <SymbolSpecification ID="5c545a62-b14d-460a-88d8-e936c0a39316" Name="Klasa"> <ApplicableSymbolKindList>