Skip to content
This repository has been archived by the owner on Apr 22, 2021. It is now read-only.

Commit

Permalink
Bugfix: ram is already in kB
Browse files Browse the repository at this point in the history
  • Loading branch information
Laurent Clouet committed Feb 14, 2019
1 parent 6c52868 commit 9dfdb35
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/com/sheepit/client/SettingsLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public SettingsLoader(String path_, String login_, String password_, String prox
cores = String.valueOf(cores_);
}
if (maxRam_ > 0) {
ram = String.valueOf(maxRam_ * 1000);
ram = String.valueOf(maxRam_);
}
if (maxRenderTime_ > 0) {
renderTime = String.valueOf(maxRenderTime_);
Expand Down

2 comments on commit 9dfdb35

@finnbear
Copy link
Contributor

@finnbear finnbear commented on 9dfdb35 Feb 18, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦‍♂️ Yes, your commit makes the ram get measured in kB. But that is not a good thing. The "* 1000" was to convert to megabytes, to be consistent with the commandine option for ram. I should have probably added a comment to the code with my pull request on this issue (which you accepted).

#174

@laurent-clouet
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's because the maxRam was already *1000 from the command line argument parsing.
Before doing the commit I launched a client with "-ui 1024" and i do get "RAM allowed 1.0 GB" on the website side.

Please sign in to comment.