lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #498

Browse Source
This commit is contained in:
yushijinhun
2018-12-16 00:31:37 +08:00
parent e6bd55aa69
commit 176968d883
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java
View File

@@ -41,6 +41,7 @@ import org.jackhuang.hmcl.util.i18n.Locales;
import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale; import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
import org.jackhuang.hmcl.util.javafx.ObservableHelper; import org.jackhuang.hmcl.util.javafx.ObservableHelper;
import org.jackhuang.hmcl.util.javafx.PropertyUtils; import org.jackhuang.hmcl.util.javafx.PropertyUtils;
import org.jetbrains.annotations.Nullable;
import java.io.File; import java.io.File;
import java.net.Proxy; import java.net.Proxy;
@@ -62,8 +63,12 @@ public final class Config implements Cloneable, Observable {
.setPrettyPrinting() .setPrettyPrinting()
.create(); .create();
@Nullable
public static Config fromJson(String json) throws JsonParseException { public static Config fromJson(String json) throws JsonParseException {
Config loaded = CONFIG_GSON.fromJson(json, Config.class); Config loaded = CONFIG_GSON.fromJson(json, Config.class);
if (loaded == null) {
return null;
}
Config instance = new Config(); Config instance = new Config();
PropertyUtils.copyProperties(loaded, instance); PropertyUtils.copyProperties(loaded, instance);
return instance; return instance;