Qt: Fix locale being set to English on settings save (fixes #906)

This commit is contained in:
Vicki Pfau 2017-12-14 09:24:06 -08:00
parent f55bf289ff
commit a1f1740d82
2 changed files with 2 additions and 1 deletions

View File

@ -30,6 +30,7 @@ Bugfixes:
- GBA Video: Add delay when enabling BGs (fixes mgba.io/i/744, mgba.io/i/752)
- GB Memory: HDMAs should not start when LCD is off (fixes mgba.io/i/310)
- GBA Cheats: Fix slide codes not initializing properly
- Qt: Fix locale being set to English on settings save (fixes mgba.io/i/906)
Misc:
- GBA Timer: Use global cycles for timers
- GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722)

View File

@ -276,7 +276,7 @@ SettingsView::SettingsView(ConfigController* controller, InputController* inputC
}
QLocale locale(name.remove(QString("%0-").arg(binaryName)).remove(".qm"));
m_ui.languages->addItem(locale.nativeLanguageName(), locale);
if (locale == QLocale()) {
if (locale.bcp47Name() == QLocale().bcp47Name()) {
m_ui.languages->setCurrentIndex(m_ui.languages->count() - 1);
}
}