From 9d074974b6ec21eeb33f636fe274b30ae6841c01 Mon Sep 17 00:00:00 2001 From: Finn Bear Date: Sun, 3 Feb 2019 13:07:12 -0800 Subject: [PATCH] Make config file loader take ram in MB for consistency When passed as inline parameters, memory is expressed as MB. However, when passed in a config file, memory was expressed as KB. This created confusion https://discordapp.com/channels/253355867938750485/301912419368697856/541719192252973066 https://discordapp.com/channels/253355867938750485/301912419368697856/541719244094701597 https://discordapp.com/channels/253355867938750485/301912419368697856/541719343684124696 --- src/com/sheepit/client/SettingsLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/sheepit/client/SettingsLoader.java b/src/com/sheepit/client/SettingsLoader.java index 553bc87..c484ec6 100644 --- a/src/com/sheepit/client/SettingsLoader.java +++ b/src/com/sheepit/client/SettingsLoader.java @@ -84,7 +84,7 @@ public class SettingsLoader { cores = String.valueOf(cores_); } if (maxRam_ > 0) { - ram = String.valueOf(maxRam_); + ram = String.valueOf(maxRam_ * 1000); } if (maxRenderTime_ > 0) { renderTime = String.valueOf(maxRenderTime_);