From b7073881345626d3db498cccd4fc432ca774dcb6 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Sun, 28 Jan 2018 14:16:05 +0800 Subject: [PATCH] Fix NullPointerException when upgrade from 2.x --- .../main/java/org/jackhuang/hmcl/game/LauncherHelper.java | 5 +++++ HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java | 2 ++ 2 files changed, 7 insertions(+) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java index 76f2ac5a3..7a4d87fec 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java @@ -135,6 +135,11 @@ public final class LauncherHelper { if (java.getParsedVersion() < JavaVersion.JAVA_8) { MessageBox.show(Main.i18n("launch.advice.newer_java")); } + + if (java.getParsedVersion() >= JavaVersion.JAVA_9) { + + } + if (java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 && org.jackhuang.hmcl.util.Platform.IS_64_BIT) { MessageBox.show(Main.i18n("launch.advice.different_platform")); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java index 7304c418f..b0a870ae8 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java @@ -64,6 +64,8 @@ public final class Profile { } public void setGlobal(VersionSetting global) { + if (global == null) + global = new VersionSetting(); globalProperty.set(global); }