all repos — mgba @ a1f1740d82a468921e24eab2d7f21d4c3c221251

mGBA Game Boy Advance Emulator

Qt: Fix locale being set to English on settings save (fixes #906)
Vicki Pfau vi@endrift.com
Thu, 14 Dec 2017 09:24:06 -0800
commit

a1f1740d82a468921e24eab2d7f21d4c3c221251

parent

f55bf289fff78fc1d71b1680b3bfdaf32d9471ee

2 files changed, 2 insertions(+), 1 deletions(-)

jump to
M CHANGESCHANGES

@@ -30,6 +30,7 @@ - GBA Savedata: Fix crash when resizing flash

- 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)
M src/platform/qt/SettingsView.cppsrc/platform/qt/SettingsView.cpp

@@ -276,7 +276,7 @@ continue;

} 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); } }