From 5f4a3649555dc1d1a6654200bf6a1f150500930f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 29 Mar 2014 22:05:53 +0100 Subject: [PATCH] Setting PermGen to 64 will omit the java param --- changelog.yaml | 1 + logic/MinecraftProcess.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changelog.yaml b/changelog.yaml index 82130021..34ab5c40 100644 --- a/changelog.yaml +++ b/changelog.yaml @@ -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 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);