'cores' is used on the command line argment so use it too on the config file

This commit is contained in:
Laurent Clouet
2018-12-11 07:25:04 +01:00
parent e70e3b636d
commit ce9c4fca5b

View File

@@ -124,7 +124,7 @@ public class SettingsLoader {
} }
if (cores != null) { if (cores != null) {
prop.setProperty("cpu-cores", cores); prop.setProperty("cores", cores);
} }
if (ram != null) { if (ram != null) {
@@ -232,10 +232,14 @@ public class SettingsLoader {
this.gpu = prop.getProperty("compute-gpu"); this.gpu = prop.getProperty("compute-gpu");
} }
if (prop.containsKey("cpu-cores")) { if (prop.containsKey("cpu-cores")) { // backward compatibility
this.cores = prop.getProperty("cpu-cores"); this.cores = prop.getProperty("cpu-cores");
} }
if (prop.containsKey("cores")) {
this.cores = prop.getProperty("cores");
}
if (prop.containsKey("ram")) { if (prop.containsKey("ram")) {
this.ram = prop.getProperty("ram"); this.ram = prop.getProperty("ram");
} }