From e946558378e6b7c021cf0f692f9f2b6f3a54b7ce Mon Sep 17 00:00:00 2001 From: DraVee Date: Mon, 23 Feb 2026 17:39:02 +0100 Subject: [PATCH] [file_sys] Check if language_entry is empty --- src/core/file_sys/control_metadata.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/file_sys/control_metadata.cpp b/src/core/file_sys/control_metadata.cpp index 3676c1bbc8..23514bed01 100644 --- a/src/core/file_sys/control_metadata.cpp +++ b/src/core/file_sys/control_metadata.cpp @@ -110,12 +110,13 @@ NACP::~NACP() = default; const LanguageEntry& NACP::GetLanguageEntry() const { u32 index = static_cast(Settings::values.language_index.GetValue()); - if (index < language_entries.size()) { + if (index < language_entries.size() && !language_entries[index].GetApplicationName().empty()) { return language_entries[index]; } for (const auto& entry : language_entries) { - return entry; + if (!entry.GetApplicationName().empty()) + return entry; } return language_entries.at(static_cast(Language::AmericanEnglish));