From 7ec43bf31a6b84c09aa2ffc76b52cadab414aaf7 Mon Sep 17 00:00:00 2001
From: bdm110 <bdm110@prontmail.com>
Date: Fri, 5 Jun 2026 09:49:18 +0800
Subject: [PATCH] fix: improve language entry retrieval logic in NACP

---
 src/core/file_sys/control_metadata.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/core/file_sys/control_metadata.cpp b/src/core/file_sys/control_metadata.cpp
index 01d79f732f..2e182f1749 100644
--- a/src/core/file_sys/control_metadata.cpp
+++ b/src/core/file_sys/control_metadata.cpp
@@ -135,18 +135,25 @@ const LanguageEntry& NACP::GetLanguageEntry() const {
         }
     }();
 
-    u32 index = u32(language);
+    const auto index = static_cast<size_t>(language);
 
-    if (index < language_entries.size() && !language_entries[index].GetApplicationName().empty()) {
+    if (index < language_entries.size() &&
+        !language_entries[index].GetApplicationName().empty()) {
         return language_entries[index];
     }
 
     for (const auto& entry : language_entries) {
-        if (!entry.GetApplicationName().empty())
-          return entry;
+        if (!entry.GetApplicationName().empty()) {
+            return entry;
+        }
     }
 
-    return language_entries.at(static_cast<u8>(Language::AmericanEnglish));
+    if (!language_entries.empty()) {
+        return language_entries.front();
+    }
+
+    static const LanguageEntry empty_entry{};
+    return empty_entry;
 }
 
 std::vector<std::string> NACP::GetApplicationNames() const {