Merge branch 'RamSlider' into 'master'

Try addressing wandering RAM slider

See merge request sheepitrenderfarm/client!100
This commit is contained in:
Sheepit Renderfarm
2022-02-19 16:51:06 +00:00

View File

@@ -481,7 +481,7 @@ public class SettingsLoader {
} }
if (config.getMaxAllowedMemory() == -1 && ram != null) { if (config.getMaxAllowedMemory() == -1 && ram != null) {
config.setMaxAllowedMemory(Utils.parseNumber(ram.getValue()) / 1024); // internal ram value is in KiB config.setMaxAllowedMemory(Utils.parseNumber(ram.getValue()) / 1000); // internal ram value is in KiB
} }
if (config.getMaxRenderTime() == -1 && renderTime != null) { if (config.getMaxRenderTime() == -1 && renderTime != null) {