This commit is contained in:
huangyuhui 2018-06-26 21:55:29 +08:00
parent 91c6c4d233
commit 71272371e4
2 changed files with 3 additions and 0 deletions

View File

@ -116,6 +116,7 @@ public final class Profile {
VersionSetting vs = repository.getVersionSetting(id); VersionSetting vs = repository.getVersionSetting(id);
if (vs == null || vs.isUsesGlobal()) { if (vs == null || vs.isUsesGlobal()) {
getGlobal().setGlobal(true); // always keep global.isGlobal = true getGlobal().setGlobal(true); // always keep global.isGlobal = true
getGlobal().setUsesGlobal(true);
return getGlobal(); return getGlobal();
} else } else
return vs; return vs;

View File

@ -173,6 +173,8 @@ public final class VersionSettingsController {
else else
globalItem.getGroup().getToggles().stream().filter(it -> it.getUserData() == Boolean.FALSE).findFirst().ifPresent(it -> it.setSelected(true)); globalItem.getGroup().getToggles().stream().filter(it -> it.getUserData() == Boolean.FALSE).findFirst().ifPresent(it -> it.setSelected(true));
globalItem.setToggleSelectedListener(newValue -> { globalItem.setToggleSelectedListener(newValue -> {
// do not call versionSettings.setUsesGlobal(true/false)
// because versionSettings can be the global one.
if ((Boolean) newValue.getUserData()) if ((Boolean) newValue.getUserData())
profile.globalizeVersionSetting(versionId); profile.globalizeVersionSetting(versionId);
else else