summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-04-22 14:31:25 -0500
committerAndrew <forkk@forkk.net>2013-04-22 14:31:25 -0500
commit7ec32d5657d433a2636f6738e162f4da6f11cde7 (patch)
tree5fa24f1eaf383d4a98fb2ad0aec7e4682f35097d
parent276cfb18a680407ca39feaaf860d4c6ee6015213 (diff)
parentae6937ab81245ed9893029ab1f7399fc53b2f0df (diff)
downloadMultiMC-7ec32d5657d433a2636f6738e162f4da6f11cde7.tar
MultiMC-7ec32d5657d433a2636f6738e162f4da6f11cde7.tar.gz
MultiMC-7ec32d5657d433a2636f6738e162f4da6f11cde7.tar.lz
MultiMC-7ec32d5657d433a2636f6738e162f4da6f11cde7.tar.xz
MultiMC-7ec32d5657d433a2636f6738e162f4da6f11cde7.zip
Merge branch 'master' of git://github.com/peterix/MultiMC5
-rw-r--r--gui/logindialog.cpp7
-rw-r--r--libsettings/src/inisettingsobject.cpp1
2 files changed, 8 insertions, 0 deletions
diff --git a/gui/logindialog.cpp b/gui/logindialog.cpp
index 842a4541..31220e74 100644
--- a/gui/logindialog.cpp
+++ b/gui/logindialog.cpp
@@ -43,6 +43,13 @@ LoginDialog::LoginDialog(QWidget *parent, const QString& loginErrMsg) :
QStringList accounts = k->getStoredAccounts("minecraft");
ui->usernameTextBox->addItems(accounts);
+ // TODO: restore last selected account here, if applicable
+
+ int index = ui->usernameTextBox->currentIndex();
+ if(index != -1)
+ {
+ ui->passwordTextBox->setFocus(Qt::OtherFocusReason);
+ }
}
LoginDialog::~LoginDialog()
diff --git a/libsettings/src/inisettingsobject.cpp b/libsettings/src/inisettingsobject.cpp
index 8c4cc89d..17b132a3 100644
--- a/libsettings/src/inisettingsobject.cpp
+++ b/libsettings/src/inisettingsobject.cpp
@@ -36,6 +36,7 @@ void INISettingsObject::changeSetting(const Setting &setting, QVariant value)
m_ini.set(setting.configKey(), value);
else
m_ini.remove(setting.configKey());
+ m_ini.saveFile(m_filePath);
}
}