diff options
| author | 2016-09-13 01:32:52 -0700 | |
|---|---|---|
| committer | 2016-09-13 01:32:52 -0700 | |
| commit | f4bb89ce7397ec51c4af64fa70ec439befd4d38f (patch) | |
| tree | 595302ae4e7e6d5cd952e665e8ce09422056a7c3 | |
| parent | Merge pull request #2059 from MerryMage/tweak-audio-latency (diff) | |
| parent | Qt: fix birthday combo box updating (diff) | |
| download | yuzu-f4bb89ce7397ec51c4af64fa70ec439befd4d38f.tar.gz yuzu-f4bb89ce7397ec51c4af64fa70ec439befd4d38f.tar.xz yuzu-f4bb89ce7397ec51c4af64fa70ec439befd4d38f.zip | |
Merge pull request #2069 from wwylele/fix-birthday
Qt: fix birthday combo box updating
Diffstat (limited to '')
| -rw-r--r-- | src/citra_qt/configure_system.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/citra_qt/configure_system.cpp b/src/citra_qt/configure_system.cpp index 55d964242..5c5d83ff3 100644 --- a/src/citra_qt/configure_system.cpp +++ b/src/citra_qt/configure_system.cpp | |||
| @@ -18,9 +18,9 @@ ConfigureSystem::ConfigureSystem(QWidget *parent) : | |||
| 18 | QWidget(parent), | 18 | QWidget(parent), |
| 19 | ui(new Ui::ConfigureSystem) { | 19 | ui(new Ui::ConfigureSystem) { |
| 20 | ui->setupUi(this); | 20 | ui->setupUi(this); |
| 21 | this->setConfiguration(); | ||
| 22 | |||
| 23 | connect(ui->combo_birthmonth, SIGNAL(currentIndexChanged(int)), SLOT(updateBirthdayComboBox(int))); | 21 | connect(ui->combo_birthmonth, SIGNAL(currentIndexChanged(int)), SLOT(updateBirthdayComboBox(int))); |
| 22 | |||
| 23 | this->setConfiguration(); | ||
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | ConfigureSystem::~ConfigureSystem() { | 26 | ConfigureSystem::~ConfigureSystem() { |
| @@ -60,6 +60,7 @@ void ConfigureSystem::ReadSystemSettings() { | |||
| 60 | // set birthday | 60 | // set birthday |
| 61 | std::tie(birthmonth, birthday) = Service::CFG::GetBirthday(); | 61 | std::tie(birthmonth, birthday) = Service::CFG::GetBirthday(); |
| 62 | ui->combo_birthmonth->setCurrentIndex(birthmonth - 1); | 62 | ui->combo_birthmonth->setCurrentIndex(birthmonth - 1); |
| 63 | updateBirthdayComboBox(birthmonth - 1); // explicitly update it because the signal from setCurrentIndex is not reliable | ||
| 63 | ui->combo_birthday->setCurrentIndex(birthday - 1); | 64 | ui->combo_birthday->setCurrentIndex(birthday - 1); |
| 64 | 65 | ||
| 65 | // set system language | 66 | // set system language |