From c779172cc276d5f94d172b2c67c7e4a432bb5aa1 Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sun, 30 Sep 2018 19:30:22 +0800
Subject: [PATCH] Fix custom toggle is not selected when using customized java

---
 .../org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java
index 625a780b3..e62734c5c 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java
@@ -246,7 +246,10 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
         }
 
         if (lastVersionSetting.isUsesCustomJavaDir()) {
-            javaItem.setSelectedData(null);
+            javaItem.getGroup().getToggles().stream()
+                    .filter(javaItem::isCustomToggle)
+                    .findFirst().get()
+                    .setSelected(true);
         } else {
             try {
                 javaItem.setSelectedData(lastVersionSetting.getJavaVersion());