From 176cd5cf143a537831bf564a837e286bb9fe509e Mon Sep 17 00:00:00 2001
From: OpenSauce04 <opensauce04@gmail.com>
Date: Tue, 16 Jun 2026 23:07:59 +0100
Subject: [PATCH] qt: Fix <System> selection becoming blank when selected

---
 src/citra_qt/configuration/configure_ui.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/citra_qt/configuration/configure_ui.cpp b/src/citra_qt/configuration/configure_ui.cpp
index 1d14b8240..7d04d8408 100644
--- a/src/citra_qt/configuration/configure_ui.cpp
+++ b/src/citra_qt/configuration/configure_ui.cpp
@@ -55,7 +55,8 @@ void ConfigureUi::InitializeLanguageComboBox() {
 void ConfigureUi::SetConfiguration() {
     ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme));
     ui->language_combobox->setCurrentIndex(
-        ui->language_combobox->findData(UISettings::values.language));
+        // findData returns -1 if nothing found; Use <System> in this case (index 0).
+        std::max(0, ui->language_combobox->findData(UISettings::values.language)));
     ui->icon_size_combobox->setCurrentIndex(
         static_cast<int>(UISettings::values.game_list_icon_size.GetValue()));
     ui->row_1_text_combobox->setCurrentIndex(