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

mgba-emu · Dec 14, 2017 · 3f921e8 · 3f921e8
1 parent eb24b25
commit 3f921e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -8,6 +8,7 @@ Bugfixes:
  - GBA Savedata: Fix crash when resizing flash
  - 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: Improve multiboot image detection
  - GB MBC: Remove erroneous bank 0 wrapping

diff --git a/src/platform/qt/SettingsView.cpp b/src/platform/qt/SettingsView.cpp
@@ -174,7 +174,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);
 		}
 	}