GH-1993 swap min/max memory settings when they are the wrong way around

2 files changed, 48 insertions, 8 deletions

diff --git a/application/pages/InstanceSettingsPage.cpp b/application/pages/InstanceSettingsPage.cpp
index 22dbd81f..90c2e92e 100644
--- a/application/pages/InstanceSettingsPage.cpp
+++ b/application/pages/InstanceSettingsPage.cpp
@@ -80,8 +80,18 @@ void InstanceSettingsPage::applySettings()
 	m_settings->set("OverrideMemory", memory);
 	if (memory)
 	{
-		m_settings->set("MinMemAlloc", ui->minMemSpinBox->value());
-		m_settings->set("MaxMemAlloc", ui->maxMemSpinBox->value());
+		int min = ui->minMemSpinBox->value();
+		int max = ui->maxMemSpinBox->value();
+		if(min < max)
+		{
+			m_settings->set("MinMemAlloc", min);
+			m_settings->set("MaxMemAlloc", max);
+		}
+		else
+		{
+			m_settings->set("MinMemAlloc", max);
+			m_settings->set("MaxMemAlloc", min);
+		}
 		m_settings->set("PermGen", ui->permGenSpinBox->value());
 	}
 	else
@@ -152,8 +162,18 @@ void InstanceSettingsPage::loadSettings()
 
 	// Memory
 	ui->memoryGroupBox->setChecked(m_settings->get("OverrideMemory").toBool());
-	ui->minMemSpinBox->setValue(m_settings->get("MinMemAlloc").toInt());
-	ui->maxMemSpinBox->setValue(m_settings->get("MaxMemAlloc").toInt());
+	int min = m_settings->get("MinMemAlloc").toInt();
+	int max = m_settings->get("MaxMemAlloc").toInt();
+	if(min < max)
+	{
+		ui->minMemSpinBox->setValue(min);
+		ui->maxMemSpinBox->setValue(max);
+	}
+	else
+	{
+		ui->minMemSpinBox->setValue(max);
+		ui->maxMemSpinBox->setValue(min);
+	}
 	ui->permGenSpinBox->setValue(m_settings->get("PermGen").toInt());
 
 	// Java Settings
diff --git a/application/pages/global/JavaPage.cpp b/application/pages/global/JavaPage.cpp
index f43fd641..81c6f7a7 100644
--- a/application/pages/global/JavaPage.cpp
+++ b/application/pages/global/JavaPage.cpp
@@ -62,8 +62,18 @@ void JavaPage::applySettings()
 	auto s = MMC->settings();
 
 	// Memory
-	s->set("MinMemAlloc", ui->minMemSpinBox->value());
-	s->set("MaxMemAlloc", ui->maxMemSpinBox->value());
+	int min = ui->minMemSpinBox->value();
+	int max = ui->maxMemSpinBox->value();
+	if(min < max)
+	{
+		s->set("MinMemAlloc", min);
+		s->set("MaxMemAlloc", max);
+	}
+	else
+	{
+		s->set("MinMemAlloc", max);
+		s->set("MaxMemAlloc", min);
+	}
 	s->set("PermGen", ui->permGenSpinBox->value());
 
 	// Java Settings
@@ -80,8 +90,18 @@ void JavaPage::loadSettings()
 {
 	auto s = MMC->settings();
 	// Memory
-	ui->minMemSpinBox->setValue(s->get("MinMemAlloc").toInt());
-	ui->maxMemSpinBox->setValue(s->get("MaxMemAlloc").toInt());
+	int min = s->get("MinMemAlloc").toInt();
+	int max = s->get("MaxMemAlloc").toInt();
+	if(min < max)
+	{
+		ui->minMemSpinBox->setValue(min);
+		ui->maxMemSpinBox->setValue(max);
+	}
+	else
+	{
+		ui->minMemSpinBox->setValue(max);
+		ui->maxMemSpinBox->setValue(min);
+	}
 	ui->permGenSpinBox->setValue(s->get("PermGen").toInt());
 
 	// Java Settings