From ce9c4fca5b1fe6d09f3012b96d3f791eb6cb2f6a Mon Sep 17 00:00:00 2001 From: Laurent Clouet Date: Tue, 11 Dec 2018 07:25:04 +0100 Subject: [PATCH] 'cores' is used on the command line argment so use it too on the config file --- src/com/sheepit/client/SettingsLoader.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/sheepit/client/SettingsLoader.java b/src/com/sheepit/client/SettingsLoader.java index e39c8b7..e2f3b71 100644 --- a/src/com/sheepit/client/SettingsLoader.java +++ b/src/com/sheepit/client/SettingsLoader.java @@ -124,7 +124,7 @@ public class SettingsLoader { } if (cores != null) { - prop.setProperty("cpu-cores", cores); + prop.setProperty("cores", cores); } if (ram != null) { @@ -232,10 +232,14 @@ public class SettingsLoader { this.gpu = prop.getProperty("compute-gpu"); } - if (prop.containsKey("cpu-cores")) { + if (prop.containsKey("cpu-cores")) { // backward compatibility this.cores = prop.getProperty("cpu-cores"); } + if (prop.containsKey("cores")) { + this.cores = prop.getProperty("cores"); + } + if (prop.containsKey("ram")) { this.ram = prop.getProperty("ram"); }