From cc13fe8bffb826315cb4b9af75cac17e226641f3 Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 27 Sep 2009 21:18:03 +0000 Subject: [PATCH] login dialog: focus for pw if password save is unchecked, memory leak fixes --- src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp | 6 +++++- .../internetgamelogindialogimpl.cpp | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 364d7af6..28bca032 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -423,7 +423,11 @@ void gameLobbyDialogImpl::removeGame(unsigned gameId) int it = 0; while (myGameListModel->item(it)) { if (myGameListModel->item(it, 0)->data(Qt::UserRole) == gameId) - { + { + delete myGameListModel->item(it, 0); + delete myGameListModel->item(it, 1); + delete myGameListModel->item(it, 2); + delete myGameListModel->item(it, 3); myGameListModel->removeRow(it); break; } diff --git a/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp b/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp index d3823588..7a4aa089 100644 --- a/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp +++ b/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp @@ -37,6 +37,10 @@ void internetGameLoginDialogImpl::exec() { checkBox_rememberPassword->setChecked(true); lineEdit_password->setText(QString::fromUtf8(QByteArray::fromBase64(myConfig->readConfigString("InternetLoginPassword").c_str()))); } + else { + checkBox_rememberPassword->setChecked(false); + lineEdit_password->clear(); + } } else { checkBox_guest->setChecked(true); @@ -44,6 +48,10 @@ void internetGameLoginDialogImpl::exec() { okButtonCheck(); + if(groupBox_reguser->isChecked() && !checkBox_rememberPassword->isChecked() && lineEdit_password->text().isEmpty()) { + lineEdit_password->setFocus(); + } + QDialog::exec(); }