1 files changed, 15 insertions, 18 deletions

diff --git a/gui/dialogs/InstanceSettings.cpp b/gui/dialogs/InstanceSettings.cpp
index 641c7fab..edb4a921 100644
--- a/gui/dialogs/InstanceSettings.cpp
+++ b/gui/dialogs/InstanceSettings.cpp
@@ -36,6 +36,9 @@ InstanceSettings::InstanceSettings(SettingsObject *obj, QWidget *parent)
 {
 	MultiMCPlatform::fixWM_CLASS(this);
 	ui->setupUi(this);
+
+	restoreGeometry(QByteArray::fromBase64(MMC->settings()->get("SettingsGeometry").toByteArray()));
+
 	loadSettings();
 }
 
@@ -47,7 +50,13 @@ InstanceSettings::~InstanceSettings()
 void InstanceSettings::showEvent(QShowEvent *ev)
 {
 	QDialog::showEvent(ev);
-	adjustSize();
+}
+
+void InstanceSettings::closeEvent(QCloseEvent *ev)
+{
+	MMC->settings()->set("SettingsGeometry", saveGeometry().toBase64());
+
+	QDialog::closeEvent(ev);
 }
 
 void InstanceSettings::on_customCommandsGroupBox_toggled(bool state)
@@ -57,12 +66,16 @@ void InstanceSettings::on_customCommandsGroupBox_toggled(bool state)
 
 void InstanceSettings::on_buttonBox_accepted()
 {
+	MMC->settings()->set("SettingsGeometry", saveGeometry().toBase64());
+
 	applySettings();
 	accept();
 }
 
 void InstanceSettings::on_buttonBox_rejected()
 {
+	MMC->settings()->set("SettingsGeometry", saveGeometry().toBase64());
+
 	reject();
 }
 
@@ -98,18 +111,6 @@ void InstanceSettings::applySettings()
 		m_obj->reset("MinecraftWinHeight");
 	}
 
-	// Auto Login
-	bool login = ui->accountSettingsBox->isChecked();
-	m_obj->set("OverrideLogin", login);
-	if (login)
-	{
-		m_obj->set("AutoLogin", ui->autoLoginCheckBox->isChecked());
-	}
-	else
-	{
-		m_obj->reset("AutoLogin");
-	}
-
 	// Memory
 	bool memory = ui->memoryGroupBox->isChecked();
 	m_obj->set("OverrideMemory", memory);
@@ -170,10 +171,6 @@ void InstanceSettings::loadSettings()
 	ui->windowWidthSpinBox->setValue(m_obj->get("MinecraftWinWidth").toInt());
 	ui->windowHeightSpinBox->setValue(m_obj->get("MinecraftWinHeight").toInt());
 
-	// Auto Login
-	ui->accountSettingsBox->setChecked(m_obj->get("OverrideLogin").toBool());
-	ui->autoLoginCheckBox->setChecked(m_obj->get("AutoLogin").toBool());
-
 	// Memory
 	ui->memoryGroupBox->setChecked(m_obj->get("OverrideMemory").toBool());
 	ui->minMemSpinBox->setValue(m_obj->get("MinMemAlloc").toInt());
@@ -243,4 +240,4 @@ void InstanceSettings::checkFinished(JavaCheckResult result)
 			tr("The specified java binary didn't work. You should use the auto-detect feature, "
 			   "or set the path to the java executable."));
 	}
-}
\ No newline at end of file
+}