Closes #3007 (#3008)

JustArchiNET · Sep 20, 2023 · af4a64b · af4a64b
1 parent 9163b57
commit af4a64b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/ArchiSteamFarm/Core/ASF.cs b/ArchiSteamFarm/Core/ASF.cs
@@ -580,6 +580,28 @@ private static async Task OnChangedKeysFile(string name, string fullPath) {
 		await OnCreatedKeysFile(name, fullPath).ConfigureAwait(false);
 	}
 
+	private static async Task OnConfigChanged() {
+		string globalConfigFile = GetFilePath(EFileType.Config);
+
+		if (string.IsNullOrEmpty(globalConfigFile)) {
+			throw new InvalidOperationException(nameof(globalConfigFile));
+		}
+
+		(GlobalConfig? globalConfig, _) = await GlobalConfig.Load(globalConfigFile).ConfigureAwait(false);
+
+		if (globalConfig == null) {
+			// Invalid config file, we allow user to fix it without destroying the ASF instance right away
+			return;
+		}
+
+		if (globalConfig == GlobalConfig) {
+			return;
+		}
+
+		ArchiLogger.LogGenericInfo(Strings.GlobalConfigChanged);
+		await RestartOrExit().ConfigureAwait(false);
+	}
+
 	private static async void OnCreated(object sender, FileSystemEventArgs e) {
 		ArgumentNullException.ThrowIfNull(sender);
 		ArgumentNullException.ThrowIfNull(e);
@@ -666,8 +688,7 @@ private static async Task OnCreatedJsonFile(string name, string fullPath) {
 		}
 
 		if (botName.Equals(SharedInfo.ASF, StringComparison.OrdinalIgnoreCase)) {
-			ArchiLogger.LogGenericInfo(Strings.GlobalConfigChanged);
-			await RestartOrExit().ConfigureAwait(false);
+			await OnConfigChanged().ConfigureAwait(false);
 
 			return;
 		}

diff --git a/ArchiSteamFarm/Steam/Bot.cs b/ArchiSteamFarm/Steam/Bot.cs
@@ -1402,16 +1402,13 @@ internal async Task OnConfigChanged(bool deleted) {
 		string configFile = GetFilePath(EFileType.Config);
 
 		if (string.IsNullOrEmpty(configFile)) {
-			ArchiLogger.LogNullError(configFile);
-
-			return;
+			throw new InvalidOperationException(nameof(configFile));
 		}
 
 		(BotConfig? botConfig, _) = await BotConfig.Load(configFile, BotName).ConfigureAwait(false);
 
 		if (botConfig == null) {
-			await Destroy().ConfigureAwait(false);
-
+			// Invalid config file, we allow user to fix it without destroying the bot right away
 			return;
 		}