From 7ff747fb6ed26229101909f2b0abb0ca03b98988 Mon Sep 17 00:00:00 2001 From: Archi Date: Fri, 23 Jul 2021 17:05:43 +0200 Subject: [PATCH] Misc --- ArchiSteamFarm/Storage/GlobalConfig.cs | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/ArchiSteamFarm/Storage/GlobalConfig.cs b/ArchiSteamFarm/Storage/GlobalConfig.cs index f928f111e..176745695 100644 --- a/ArchiSteamFarm/Storage/GlobalConfig.cs +++ b/ArchiSteamFarm/Storage/GlobalConfig.cs @@ -221,6 +221,16 @@ namespace ArchiSteamFarm.Storage { [JsonProperty(Required = Required.DisallowNull)] public bool IPC { get; private set; } = DefaultIPC; + [JsonProperty] + public string? IPCPassword { + get => BackingIPCPassword; + + set { + IsIPCPasswordSet = true; + BackingIPCPassword = value; + } + } + [JsonProperty(Required = Required.DisallowNull)] public ArchiCryptoHelper.EHashingMethod IPCPasswordFormat { get; private set; } = DefaultIPCPasswordFormat; @@ -278,18 +288,7 @@ namespace ArchiSteamFarm.Storage { set; } - [JsonProperty] - public string? IPCPassword { - get => BackingIPCPassword; - - set { - IsIPCPasswordSet = true; - BackingIPCPassword = value; - } - } - internal bool IsIPCPasswordSet { get; private set; } - internal bool IsWebProxyPasswordSet { get; private set; } internal bool Saving { get; set; } @@ -305,7 +304,6 @@ namespace ArchiSteamFarm.Storage { } private string? BackingIPCPassword = DefaultIPCPassword; - private WebProxy? BackingWebProxy; private string? BackingWebProxyPassword = DefaultWebProxyPassword; @@ -464,7 +462,7 @@ namespace ArchiSteamFarm.Storage { public bool ShouldSerializeIdleFarmingPeriod() => !Saving || (IdleFarmingPeriod != DefaultIdleFarmingPeriod); public bool ShouldSerializeInventoryLimiterDelay() => !Saving || (InventoryLimiterDelay != DefaultInventoryLimiterDelay); public bool ShouldSerializeIPC() => !Saving || (IPC != DefaultIPC); - public bool ShouldSerializeIPCPassword() => Saving && (IPCPassword != DefaultIPCPassword); + public bool ShouldSerializeIPCPassword() => Saving && IsIPCPasswordSet && (IPCPassword != DefaultIPCPassword); public bool ShouldSerializeIPCPasswordFormat() => !Saving || (IPCPasswordFormat != DefaultIPCPasswordFormat); public bool ShouldSerializeLoginLimiterDelay() => !Saving || (LoginLimiterDelay != DefaultLoginLimiterDelay); public bool ShouldSerializeMaxFarmingTime() => !Saving || (MaxFarmingTime != DefaultMaxFarmingTime);