From df29d47c0a69bba9acbc10329ae8133468939ce7 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Sat, 16 Jun 2018 20:36:08 +0800 Subject: [PATCH] =?UTF-8?q?workaround:=20=E5=B0=86Settings=E4=B8=AD?= =?UTF-8?q?=E7=9A=84Config=E5=AD=97=E6=AE=B5=E6=94=B9=E4=B8=BA=E9=9D=99?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/jackhuang/hmcl/setting/Settings.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java index b446ad3e2..279d945c4 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java @@ -74,10 +74,9 @@ public class Settings { public static final String SETTINGS_FILE_NAME = "hmcl.json"; public static final File SETTINGS_FILE = new File(SETTINGS_FILE_NAME).getAbsoluteFile(); - public static final Settings INSTANCE = new Settings(); + public static final Config SETTINGS = initSettings(); - // TODO: another way to access this property aside from Settings.INSTANCE.SETTINGS - public final Config SETTINGS = initSettings(); + public static final Settings INSTANCE = new Settings(); private final Map accounts = new ConcurrentHashMap<>(); @@ -122,7 +121,7 @@ public class Settings { Lang.ignoringException(() -> Runtime.getRuntime().addShutdownHook(new Thread(this::save))); } - private Config initSettings() { + private static Config initSettings() { Config c = new Config(); if (SETTINGS_FILE.exists()) try {