Fixed NullPointerException when only hidden version here

HMCL-dev · Mar 1, 2016 · 5dc8120 · 5dc8120
1 parent 3ba75d2
commit 5dc8120
Showing 1 changed file with 4 additions and 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
@@ -23,6 +23,7 @@
 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 String getSettingsSelectedMinecraftVersion() {
     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);
         }