summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-03-29 22:05:53 +0100
committerPetr Mrázek <peterix@gmail.com>2014-03-29 22:05:53 +0100
commit5f4a3649555dc1d1a6654200bf6a1f150500930f (patch)
tree30a90530b4db47b1d16dc6cca279ac1173787fea /logic
parentff9f9dd629dc58aaf2c37449f1741eee28da29d2 (diff)
downloadMultiMC-5f4a3649555dc1d1a6654200bf6a1f150500930f.tar
MultiMC-5f4a3649555dc1d1a6654200bf6a1f150500930f.tar.gz
MultiMC-5f4a3649555dc1d1a6654200bf6a1f150500930f.tar.lz
MultiMC-5f4a3649555dc1d1a6654200bf6a1f150500930f.tar.xz
MultiMC-5f4a3649555dc1d1a6654200bf6a1f150500930f.zip
Setting PermGen to 64 will omit the java param
Diffstat (limited to 'logic')
-rw-r--r--logic/MinecraftProcess.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/logic/MinecraftProcess.cpp b/logic/MinecraftProcess.cpp
index 2dd40e99..5f4333b9 100644
--- a/logic/MinecraftProcess.cpp
+++ b/logic/MinecraftProcess.cpp
@@ -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);