From 5e04ddf794d4e026a276db07e4c1868f996f3c52 Mon Sep 17 00:00:00 2001 From: Pieter12345 Date: Fri, 29 Jan 2021 15:16:17 +0100 Subject: [PATCH] Initialize preferences before Telemetry nag Initialize preferences before relying on them in telemetry nag code in several cmdline tools. Fixes #1255. --- src/main/java/com/laytonsmith/core/Main.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/laytonsmith/core/Main.java b/src/main/java/com/laytonsmith/core/Main.java index afae2b4efc..37e36c82bc 100644 --- a/src/main/java/com/laytonsmith/core/Main.java +++ b/src/main/java/com/laytonsmith/core/Main.java @@ -422,6 +422,7 @@ public ArgumentParser getArgumentParser() { @Override public void execute(ArgumentParser.ArgumentParserResults parsedArgs) throws Exception { + Prefs.init(MethodScriptFileLocations.getDefault().getPreferencesFile()); Telemetry.GetDefault().doNag(); String commandName = parsedArgs.getStringArgument("command"); Interpreter.install(commandName); @@ -459,6 +460,7 @@ public ArgumentParser getArgumentParser() { public void execute(ArgumentParser.ArgumentParserResults parsedArgs) throws Exception { // TODO: This should eventually be changed to use an independent // versioning scheme for CH and MS. + Prefs.init(MethodScriptFileLocations.getDefault().getPreferencesFile()); Telemetry.GetDefault().doNag(); StreamUtils.GetSystemOut().println("You are running " + Implementation.GetServerType().getBranding() + " version " + Static.loadSelfVersion()); @@ -537,6 +539,7 @@ public ArgumentParser getArgumentParser() { @Override @SuppressWarnings("ResultOfObjectAllocationIgnored") public void execute(ArgumentParser.ArgumentParserResults parsedArgs) throws Exception { + Prefs.init(MethodScriptFileLocations.getDefault().getPreferencesFile()); Telemetry.GetDefault().doNag(); new Interpreter(parsedArgs.getStringListArgument(), parsedArgs.getStringArgument("location-----")); } @@ -1668,6 +1671,7 @@ public ArgumentParser getArgumentParser() { @Override public void execute(ArgumentParser.ArgumentParserResults parsedArgs) throws Exception { + Prefs.init(MethodScriptFileLocations.getDefault().getPreferencesFile()); Telemetry.GetDefault().doNag(); Map topics = new HashMap<>(); for(ExtensionTracker t : ExtensionManager.getTrackers().values()) {