diff options
author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-05-29 16:10:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-29 16:10:55 +0200 |
commit | f5405e835e0e7b8eebec3abaf898f0e12c4b1472 (patch) | |
tree | 968cb660d59bbbc99dc74b73f9a98d82a80c2741 /launcher/ui/pages/global/JavaPage.cpp | |
parent | 85ee7fb3a4ba66230a020ca86889a8c90c969c0e (diff) | |
parent | 20832682efc4205f350c27c1d8aa6681925c76e6 (diff) | |
download | PrismLauncher-f5405e835e0e7b8eebec3abaf898f0e12c4b1472.tar.gz PrismLauncher-f5405e835e0e7b8eebec3abaf898f0e12c4b1472.tar.bz2 PrismLauncher-f5405e835e0e7b8eebec3abaf898f0e12c4b1472.zip |
Merge pull request #624 from ryanccn/global-jvm-args
Make global JVM arguments multi-line
Diffstat (limited to 'launcher/ui/pages/global/JavaPage.cpp')
-rw-r--r-- | launcher/ui/pages/global/JavaPage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp index b5e8de6c..025771e8 100644 --- a/launcher/ui/pages/global/JavaPage.cpp +++ b/launcher/ui/pages/global/JavaPage.cpp @@ -95,7 +95,7 @@ void JavaPage::applySettings() // Java Settings s->set("JavaPath", ui->javaPathTextBox->text()); - s->set("JvmArgs", ui->jvmArgsTextBox->text()); + s->set("JvmArgs", ui->jvmArgsTextBox->toPlainText().replace("\n", " ")); s->set("IgnoreJavaCompatibility", ui->skipCompatibilityCheckbox->isChecked()); s->set("IgnoreJavaWizard", ui->skipJavaWizardCheckbox->isChecked()); JavaCommon::checkJVMArgs(s->get("JvmArgs").toString(), this->parentWidget()); @@ -120,7 +120,7 @@ void JavaPage::loadSettings() // Java Settings ui->javaPathTextBox->setText(s->get("JavaPath").toString()); - ui->jvmArgsTextBox->setText(s->get("JvmArgs").toString()); + ui->jvmArgsTextBox->setPlainText(s->get("JvmArgs").toString()); ui->skipCompatibilityCheckbox->setChecked(s->get("IgnoreJavaCompatibility").toBool()); ui->skipJavaWizardCheckbox->setChecked(s->get("IgnoreJavaWizard").toBool()); } @@ -166,7 +166,7 @@ void JavaPage::on_javaTestBtn_clicked() return; } checker.reset(new JavaCommon::TestCheck( - this, ui->javaPathTextBox->text(), ui->jvmArgsTextBox->text(), + this, ui->javaPathTextBox->text(), ui->jvmArgsTextBox->toPlainText().replace("\n", " "), ui->minMemSpinBox->value(), ui->maxMemSpinBox->value(), ui->permGenSpinBox->value())); connect(checker.get(), SIGNAL(finished()), SLOT(checkerFinished())); checker->run(); |