From 71272371e4e633cd605daef9fedb754c99eb011c Mon Sep 17 00:00:00 2001
From: huangyuhui <huanghongxun2008@126.com>
Date: Tue, 26 Jun 2018 21:55:29 +0800
Subject: [PATCH] Fix #356

---
 HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java      | 1 +
 .../java/org/jackhuang/hmcl/ui/VersionSettingsController.java   | 2 ++
 2 files changed, 3 insertions(+)

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 6b7c4257b..78724cea0 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java
@@ -116,6 +116,7 @@ public final class Profile {
         VersionSetting vs = repository.getVersionSetting(id);
         if (vs == null || vs.isUsesGlobal()) {
             getGlobal().setGlobal(true); // always keep global.isGlobal = true
+            getGlobal().setUsesGlobal(true);
             return getGlobal();
         } else
             return vs;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionSettingsController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionSettingsController.java
index 162d30e5c..3c119270b 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionSettingsController.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionSettingsController.java
@@ -173,6 +173,8 @@ public final class VersionSettingsController {
         else
             globalItem.getGroup().getToggles().stream().filter(it -> it.getUserData() == Boolean.FALSE).findFirst().ifPresent(it -> it.setSelected(true));
         globalItem.setToggleSelectedListener(newValue -> {
+            // do not call versionSettings.setUsesGlobal(true/false)
+            // because versionSettings can be the global one.
             if ((Boolean) newValue.getUserData())
                 profile.globalizeVersionSetting(versionId);
             else