From 565acca9fbf81834d0b970d72e892d88e9110401 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Mon, 18 Apr 2016 18:38:48 +0200 Subject: [PATCH] Add AutoRestart property --- ArchiSteamFarm/GlobalConfig.cs | 3 +++ ArchiSteamFarm/Program.cs | 13 ++++++++++--- ArchiSteamFarm/config/ASF.json | 1 + ConfigGenerator/GlobalConfig.cs | 3 +++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ArchiSteamFarm/GlobalConfig.cs b/ArchiSteamFarm/GlobalConfig.cs index 02592184d..ad4b71dc9 100644 --- a/ArchiSteamFarm/GlobalConfig.cs +++ b/ArchiSteamFarm/GlobalConfig.cs @@ -55,6 +55,9 @@ namespace ArchiSteamFarm { [JsonProperty(Required = Required.DisallowNull)] internal bool AutoUpdates { get; private set; } = true; + [JsonProperty(Required = Required.DisallowNull)] + internal bool AutoRestart { get; private set; } = true; + [JsonProperty(Required = Required.DisallowNull)] internal EUpdateChannel UpdateChannel { get; private set; } = EUpdateChannel.Stable; diff --git a/ArchiSteamFarm/Program.cs b/ArchiSteamFarm/Program.cs index 700376d5b..b8bf8f24b 100644 --- a/ArchiSteamFarm/Program.cs +++ b/ArchiSteamFarm/Program.cs @@ -251,10 +251,17 @@ namespace ArchiSteamFarm { return; } - Logging.LogGenericInfo("Update process is finished! ASF will now restart itself..."); - await Utilities.SleepAsync(5000); + Logging.LogGenericInfo("Update process finished!"); - Restart(); + if (GlobalConfig.AutoRestart) { + Logging.LogGenericInfo("Restarting..."); + await Utilities.SleepAsync(5000).ConfigureAwait(false); + Restart(); + } else { + Logging.LogGenericInfo("Exiting..."); + await Utilities.SleepAsync(5000).ConfigureAwait(false); + Exit(); + } } internal static void Exit(int exitCode = 0) { diff --git a/ArchiSteamFarm/config/ASF.json b/ArchiSteamFarm/config/ASF.json index 047208413..a8f3bf25a 100644 --- a/ArchiSteamFarm/config/ASF.json +++ b/ArchiSteamFarm/config/ASF.json @@ -2,6 +2,7 @@ "Debug": false, "Headless": false, "AutoUpdates": true, + "AutoRestart": true, "UpdateChannel": 1, "SteamProtocol": 6, "SteamOwnerID": 0, diff --git a/ConfigGenerator/GlobalConfig.cs b/ConfigGenerator/GlobalConfig.cs index 161cde0a4..cf63de575 100644 --- a/ConfigGenerator/GlobalConfig.cs +++ b/ConfigGenerator/GlobalConfig.cs @@ -54,6 +54,9 @@ namespace ConfigGenerator { [JsonProperty(Required = Required.DisallowNull)] public bool AutoUpdates { get; set; } = true; + [JsonProperty(Required = Required.DisallowNull)] + public bool AutoRestart { get; set; } = true; + [JsonProperty(Required = Required.DisallowNull)] public EUpdateChannel UpdateChannel { get; set; } = EUpdateChannel.Stable;