summaryrefslogtreecommitdiff
path: root/src/SMAPI
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2022-04-09 11:54:23 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2022-04-09 11:54:23 -0400
commit6161cc91297dd215a35bfd4d8862d27a0d937898 (patch)
tree77ae9d752aab9e8333837f877e49e0526e9d4390 /src/SMAPI
parent092f0aa4eaa23c169c1ca5e8b213915f563f5053 (diff)
downloadSMAPI-6161cc91297dd215a35bfd4d8862d27a0d937898.tar.gz
SMAPI-6161cc91297dd215a35bfd4d8862d27a0d937898.tar.bz2
SMAPI-6161cc91297dd215a35bfd4d8862d27a0d937898.zip
fix config.user.json overriding new CLI arguments
Diffstat (limited to 'src/SMAPI')
-rw-r--r--src/SMAPI/Framework/SCore.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index 4746c2ce..44f46179 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -184,10 +184,9 @@ namespace StardewModdingAPI.Framework
// init basics
this.Settings = JsonConvert.DeserializeObject<SConfig>(File.ReadAllText(Constants.ApiConfigPath));
- this.Settings.DeveloperMode = developerMode ?? this.Settings.DeveloperMode;
-
if (File.Exists(Constants.ApiUserConfigPath))
JsonConvert.PopulateObject(File.ReadAllText(Constants.ApiUserConfigPath), this.Settings);
+ this.Settings.DeveloperMode = developerMode ?? this.Settings.DeveloperMode;
this.LogManager = new LogManager(logPath: logPath, colorConfig: this.Settings.ConsoleColors, writeToConsole: writeToConsole, isVerbose: this.Settings.VerboseLogging, isDeveloperMode: this.Settings.DeveloperMode, getScreenIdForLog: this.GetScreenIdForLog);
this.CommandManager = new CommandManager(this.Monitor);