From 5dc812072f1b3dd79a93fb139fb9d3d4cb8eb99b Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Tue, 1 Mar 2016 12:40:25 +0800 Subject: [PATCH] Fixed NullPointerException when only hidden version here --- .../jackhuang/hellominecraft/launcher/setting/Profile.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java index 2e1d6a84d..edb9d8334 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java @@ -23,6 +23,7 @@ import java.io.File; import org.jackhuang.hellominecraft.launcher.api.PluginManager; import org.jackhuang.hellominecraft.launcher.core.MCUtils; import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; import org.jackhuang.hellominecraft.util.system.IOUtils; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.util.EventHandler; @@ -87,8 +88,9 @@ public final class Profile { public String getSelectedVersion() { String v = selectedMinecraftVersion; if (StrUtils.isBlank(v) || service().version().getVersionById(v) == null || service().version().getVersionById(v).hidden) { - if (service().version().getVersionCount() > 0) - v = service().version().getOneVersion(t -> !t.hidden).id; + MinecraftVersion mv = service().version().getOneVersion(t -> !t.hidden); + if (mv != null) + v = mv.id; if (StrUtils.isNotBlank(v)) setSelectedMinecraftVersion(v); }