ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 eb24b2515b
commit 3f921e8f2c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -8,6 +8,7 @@ Bugfixes:
- GBA Savedata: Fix crash when resizing flash - GBA Savedata: Fix crash when resizing flash
- GB Memory: HDMAs should not start when LCD is off (fixes mgba.io/i/310) - GB Memory: HDMAs should not start when LCD is off (fixes mgba.io/i/310)
- GBA Cheats: Fix slide codes not initializing properly - GBA Cheats: Fix slide codes not initializing properly
- Qt: Fix locale being set to English on settings save (fixes mgba.io/i/906)
Misc: Misc:
- GBA: Improve multiboot image detection - GBA: Improve multiboot image detection
- GB MBC: Remove erroneous bank 0 wrapping - GB MBC: Remove erroneous bank 0 wrapping

2
src/platform/qt/SettingsView.cpp
View File

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