NOISSUE block use of "-XX-MaxHeapSize" and "-XX:InitialHeapSize" java args.
Synonyms for "-Xms" and "-Xmx" that I missed originally. These are ALWAYS managed by MultiMC. Do not touch them.
This commit is contained in:
parent
794102b32c
commit
f06ac02396
@ -4,18 +4,16 @@
|
|||||||
|
|
||||||
bool JavaCommon::checkJVMArgs(QString jvmargs, QWidget *parent)
|
bool JavaCommon::checkJVMArgs(QString jvmargs, QWidget *parent)
|
||||||
{
|
{
|
||||||
if (jvmargs.contains("-XX:PermSize=") || jvmargs.contains(QRegExp("-Xm[sx]")))
|
if (jvmargs.contains("-XX:PermSize=") || jvmargs.contains(QRegExp("-Xm[sx]"))
|
||||||
|
|| jvmargs.contains("-XX-MaxHeapSize") || jvmargs.contains("-XX:InitialHeapSize"))
|
||||||
{
|
{
|
||||||
|
auto warnStr = QObject::tr(
|
||||||
|
"You tried to manually set a JVM memory option (using \"-XX:PermSize\", \"-XX-MaxHeapSize\", \"-XX:InitialHeapSize\", \"-Xmx\" or \"-Xms\").\n"
|
||||||
|
"There are dedicated boxes for these in the settings (Java tab, in the Memory group at the top).\n"
|
||||||
|
"This message will be displayed until you remove them from the JVM arguments.");
|
||||||
CustomMessageBox::selectable(
|
CustomMessageBox::selectable(
|
||||||
parent, QObject::tr("JVM arguments warning"),
|
parent, QObject::tr("JVM arguments warning"),
|
||||||
QObject::tr("You tried to manually set a JVM memory option (using "
|
warnStr,
|
||||||
" \"-XX:PermSize\", \"-Xmx\" or \"-Xms\") - there"
|
|
||||||
" are dedicated boxes for these in the settings (Java"
|
|
||||||
" tab, in the Memory group at the top).\n"
|
|
||||||
"Your manual settings will be overridden by the"
|
|
||||||
" dedicated options.\n"
|
|
||||||
"This message will be displayed until you remove them"
|
|
||||||
" from the JVM arguments."),
|
|
||||||
QMessageBox::Warning)->exec();
|
QMessageBox::Warning)->exec();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -102,3 +100,4 @@ void JavaCommon::TestCheck::checkFinishedWithArgs(JavaCheckResult result)
|
|||||||
javaArgsWereBad(m_parent, result);
|
javaArgsWereBad(m_parent, result);
|
||||||
emit finished();
|
emit finished();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user