Merge branch 'dev' of github.com:GravitLauncher/Launcher into dev

This commit is contained in:
Gravit 2019-07-06 20:26:58 +07:00
commit 27b54cccba
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
2 changed files with 2 additions and 0 deletions

View file

@ -15,6 +15,7 @@ var config = {
settingsMagic: 0xC0DE5, // Magic, don't touch settingsMagic: 0xC0DE5, // Magic, don't touch
autoEnterDefault: false, // Should autoEnter be enabled by default? autoEnterDefault: false, // Should autoEnter be enabled by default?
fullScreenDefault: false, // Should fullScreen be enabled by default? fullScreenDefault: false, // Should fullScreen be enabled by default?
featureStoreDefault: true, // Should featureStore be enabled by default?
ramDefault: 1024, // Default RAM amount (0 for auto) ramDefault: 1024, // Default RAM amount (0 for auto)
jvm: { jvm: {

View file

@ -10,6 +10,7 @@ var settingsManagerClass = Java.extend(SettingsManagerClass.static, {
new_settings.fullScreen = config.fullScreenDefault; new_settings.fullScreen = config.fullScreenDefault;
new_settings.ram = config.ramDefault; new_settings.ram = config.ramDefault;
new_settings.featureStore = config.featureStoreDefault;
new_settings.lastDigest = null; new_settings.lastDigest = null;
new_settings.lastProfiles.clear(); new_settings.lastProfiles.clear();
new_settings.lastHDirs.clear(); new_settings.lastHDirs.clear();