Skip to content

Commit 5e04ddf

Browse files
committed
Initialize preferences before Telemetry nag
Initialize preferences before relying on them in telemetry nag code in several cmdline tools. Fixes #1255.
1 parent 60f1a26 commit 5e04ddf

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/main/java/com/laytonsmith/core/Main.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ public ArgumentParser getArgumentParser() {
422422

423423
@Override
424424
public void execute(ArgumentParser.ArgumentParserResults parsedArgs) throws Exception {
425+
Prefs.init(MethodScriptFileLocations.getDefault().getPreferencesFile());
425426
Telemetry.GetDefault().doNag();
426427
String commandName = parsedArgs.getStringArgument("command");
427428
Interpreter.install(commandName);
@@ -459,6 +460,7 @@ public ArgumentParser getArgumentParser() {
459460
public void execute(ArgumentParser.ArgumentParserResults parsedArgs) throws Exception {
460461
// TODO: This should eventually be changed to use an independent
461462
// versioning scheme for CH and MS.
463+
Prefs.init(MethodScriptFileLocations.getDefault().getPreferencesFile());
462464
Telemetry.GetDefault().doNag();
463465
StreamUtils.GetSystemOut().println("You are running "
464466
+ Implementation.GetServerType().getBranding() + " version " + Static.loadSelfVersion());
@@ -537,6 +539,7 @@ public ArgumentParser getArgumentParser() {
537539
@Override
538540
@SuppressWarnings("ResultOfObjectAllocationIgnored")
539541
public void execute(ArgumentParser.ArgumentParserResults parsedArgs) throws Exception {
542+
Prefs.init(MethodScriptFileLocations.getDefault().getPreferencesFile());
540543
Telemetry.GetDefault().doNag();
541544
new Interpreter(parsedArgs.getStringListArgument(), parsedArgs.getStringArgument("location-----"));
542545
}
@@ -1668,6 +1671,7 @@ public ArgumentParser getArgumentParser() {
16681671

16691672
@Override
16701673
public void execute(ArgumentParser.ArgumentParserResults parsedArgs) throws Exception {
1674+
Prefs.init(MethodScriptFileLocations.getDefault().getPreferencesFile());
16711675
Telemetry.GetDefault().doNag();
16721676
Map<String, String> topics = new HashMap<>();
16731677
for(ExtensionTracker t : ExtensionManager.getTrackers().values()) {

0 commit comments

Comments
 (0)