Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 14:10:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing LicenseID inheritance from current

Browse Source
This commit is contained in:
Łukasz Domeradzki
2024-05-10 13:27:49 +02:00
parent 81789c717f
commit 6014b3bdc6
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ArchiSteamFarm/IPC/Controllers/Api/ASFController.cs
View File

@@ -121,6 +121,10 @@ public sealed class ASFController : ArchiController {
request.GlobalConfig.IPCPassword = ASF.GlobalConfig.IPCPassword;
}
if (!request.GlobalConfig.IsLicenseIDSet && ASF.GlobalConfig.IsLicenseIDSet) {
request.GlobalConfig.LicenseID = ASF.GlobalConfig.LicenseID;
}
if (!request.GlobalConfig.IsWebProxyPasswordSet && ASF.GlobalConfig.IsWebProxyPasswordSet) {
request.GlobalConfig.WebProxyPassword = ASF.GlobalConfig.WebProxyPassword;
}

8
ArchiSteamFarm/Storage/GlobalConfig.cs
View File

@@ -270,8 +270,8 @@ public sealed class GlobalConfig {
public Guid? LicenseID {
get => BackingLicenseID;
private set {
IsLicenseIdSet = true;
internal set {
IsLicenseIDSet = true;
BackingLicenseID = value;
}
}
@@ -336,7 +336,7 @@ public sealed class GlobalConfig {
[JsonInclude]
public string? WebProxyUsername { get; private init; } = DefaultWebProxyUsername;
internal bool IsLicenseIdSet;
internal bool IsLicenseIDSet;
[JsonExtensionData]
[JsonInclude]
@@ -433,7 +433,7 @@ public sealed class GlobalConfig {
public bool ShouldSerializeIPCPasswordFormat() => !Saving || (IPCPasswordFormat != DefaultIPCPasswordFormat);
[UsedImplicitly]
public bool ShouldSerializeLicenseID() => Saving && IsLicenseIdSet && (LicenseID != DefaultLicenseID) && (LicenseID != Guid.Empty);
public bool ShouldSerializeLicenseID() => Saving && IsLicenseIDSet && (LicenseID != DefaultLicenseID) && (LicenseID != Guid.Empty);
[UsedImplicitly]
public bool ShouldSerializeLoginLimiterDelay() => !Saving || (LoginLimiterDelay != DefaultLoginLimiterDelay);