diff --git a/application/setupwizard/JavaWizardPage.cpp b/application/setupwizard/JavaWizardPage.cpp index ad571c09..bec3fabe 100644 --- a/application/setupwizard/JavaWizardPage.cpp +++ b/application/setupwizard/JavaWizardPage.cpp @@ -45,7 +45,13 @@ void JavaWizardPage::refresh() void JavaWizardPage::initializePage() { - m_java_widget->initialize(); + auto s = MMC->settings(); + m_java_widget->initialize( + s->get("JavaPath").toString(), + s->get("MinMemAlloc").toInt(), + s->get("MaxMemAlloc").toInt(), + s->get("PermGen").toInt() + ); } bool JavaWizardPage::wantsRefreshButton() diff --git a/application/widgets/JavaSettingsWidget.cpp b/application/widgets/JavaSettingsWidget.cpp index a11dd1aa..d4f1a2ed 100644 --- a/application/widgets/JavaSettingsWidget.cpp +++ b/application/widgets/JavaSettingsWidget.cpp @@ -113,15 +113,15 @@ void JavaSettingsWidget::setupUi() retranslate(); } -void JavaSettingsWidget::initialize() +void JavaSettingsWidget::initialize(const QString& currentJavaPath, int minHeap, int maxHeap, int permGen) { m_versionWidget->initialize(MMC->javalist().get()); m_versionWidget->setResizeOn(2); - auto s = MMC->settings(); // Memory - observedMinMemory = s->get("MinMemAlloc").toInt(); - observedMaxMemory = s->get("MaxMemAlloc").toInt(); - observedPermGenMemory = s->get("PermGen").toInt(); + observedMinMemory = minHeap; + observedMaxMemory = maxHeap; + observedPermGenMemory = permGen; + m_javaPathTextBox->setText(currentJavaPath); m_minMemSpinBox->setValue(observedMinMemory); m_maxMemSpinBox->setValue(observedMaxMemory); m_permGenSpinBox->setValue(observedPermGenMemory); diff --git a/application/widgets/JavaSettingsWidget.h b/application/widgets/JavaSettingsWidget.h index 0d280daf..2cd4dbb7 100644 --- a/application/widgets/JavaSettingsWidget.h +++ b/application/widgets/JavaSettingsWidget.h @@ -46,7 +46,7 @@ public: }; void refresh(); - void initialize(); + void initialize(const QString& currentJavaPath, int minHeap, int maxHeap, int permGen); ValidationStatus validate(); void retranslate();