From 8584f804e092e778b0b484e32dca2891aca0e2a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 19 Feb 2026 00:39:50 +0100 Subject: [PATCH] Android: Remove the unused ability to override the lang path Attempt at crash fix in ReportScreen --- UI/NativeApp.cpp | 11 +---------- UI/ReportScreen.cpp | 3 --- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index ffe79b5f56..84596b04ec 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -242,16 +242,7 @@ void PostLoadConfig() { if (g_Config.currentDirectory.empty()) { g_Config.currentDirectory = g_Config.defaultCurrentDirectory; } - - // Allow the lang directory to be overridden for testing purposes (e.g. Android, where it's hard to - // test new languages without recompiling the entire app, which is a hassle). - const Path langOverridePath = GetSysDirectory(DIRECTORY_SYSTEM) / "lang"; - - // If we run into the unlikely case that "lang" is actually a file, just use the built-in translations. - if (!File::Exists(langOverridePath) || !File::IsDirectory(langOverridePath)) - g_i18nrepo.LoadIni(g_Config.sLanguageIni); - else - g_i18nrepo.LoadIni(g_Config.sLanguageIni, langOverridePath); + g_i18nrepo.LoadIni(g_Config.sLanguageIni); #if !PPSSPP_PLATFORM(WINDOWS) || PPSSPP_PLATFORM(UWP) CreateSysDirectories(); diff --git a/UI/ReportScreen.cpp b/UI/ReportScreen.cpp index d6bed71b89..5268239360 100644 --- a/UI/ReportScreen.cpp +++ b/UI/ReportScreen.cpp @@ -180,9 +180,6 @@ ScreenRenderFlags ReportScreen::PreRender(ScreenRenderMode mode) { if (result == ScreenshotResult::Success) { // Redo the views already, now with a screenshot included. RecreateViews(); - } else { - // Good news (?), the views are good as-is without a screenshot. - screenshotFilename_.clear(); } });