mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-11-20 08:10:11 +00:00
Code Issues Projects Releases Wiki Activity

Setting PermGen to 64 will omit the java param

Browse Source
This commit is contained in:
Petr Mrázek 2014-03-29 22:05:53 +01:00
parent ff9f9dd629
commit 5f4a364955
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.yaml
View File

@ -52,3 +52,4 @@
- Instance badges
- Some pre/post command stuff (remove the timeout, variable substitution)
- Fix logging when the system language is not en_US
- Setting PermGen to 64 will now omit the java parameter because it is the default

6
logic/MinecraftProcess.cpp
View File

@ -415,7 +415,11 @@ QStringList MinecraftProcess::javaArguments() const
args << QString("-Xms%1m").arg(m_instance->settings().get("MinMemAlloc").toInt());
args << QString("-Xmx%1m").arg(m_instance->settings().get("MaxMemAlloc").toInt());
args << QString("-XX:PermSize=%1m").arg(m_instance->settings().get("PermGen").toInt());
auto permgen = m_instance->settings().get("PermGen").toInt();
if(permgen != 64)
{
args << QString("-XX:PermSize=%1m").arg(permgen);
}
args << "-Duser.language=en";
if (!m_nativeFolder.isEmpty())
args << QString("-Djava.library.path=%1").arg(m_nativeFolder);