citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #2069 from wwylele/fix-birthday 

Qt: fix birthday combo box updating
This commit is contained in:
Yuri Kunde Schlesner 2016-09-13 01:32:52 -07:00 committed by GitHub
parent 5cd3701663 c0262001d8
commit f4bb89ce73
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/citra_qt/configure_system.cpp
View File

@ -18,9 +18,9 @@ ConfigureSystem::ConfigureSystem(QWidget *parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::ConfigureSystem) { ui(new Ui::ConfigureSystem) {
ui->setupUi(this); ui->setupUi(this);
this->setConfiguration();
connect(ui->combo_birthmonth, SIGNAL(currentIndexChanged(int)), SLOT(updateBirthdayComboBox(int))); connect(ui->combo_birthmonth, SIGNAL(currentIndexChanged(int)), SLOT(updateBirthdayComboBox(int)));
this->setConfiguration();
} }
ConfigureSystem::~ConfigureSystem() { ConfigureSystem::~ConfigureSystem() {
@ -60,6 +60,7 @@ void ConfigureSystem::ReadSystemSettings() {
// set birthday // set birthday
std::tie(birthmonth, birthday) = Service::CFG::GetBirthday(); std::tie(birthmonth, birthday) = Service::CFG::GetBirthday();
ui->combo_birthmonth->setCurrentIndex(birthmonth - 1); ui->combo_birthmonth->setCurrentIndex(birthmonth - 1);
updateBirthdayComboBox(birthmonth - 1); // explicitly update it because the signal from setCurrentIndex is not reliable
ui->combo_birthday->setCurrentIndex(birthday - 1); ui->combo_birthday->setCurrentIndex(birthday - 1);
// set system language // set system language