From cb0e01d647cd29181476f5c33b02b07eef15fa2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 7 Nov 2026 16:21:02 +0100 Subject: [PATCH] Firmware screen: Always show the install-from-game-discs option It came after the early return for an empty NAND, so it was hidden exactly when it matters most, before any firmware is installed. It now sits under the description, which is there in every state. Co-Authored-By: Claude Opus 5.5 --- UI/FirmwareScreen.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/UI/FirmwareScreen.cpp b/UI/FirmwareScreen.cpp index 3aa16c5c04..f8ec54950d 100644 --- a/UI/FirmwareScreen.cpp +++ b/UI/FirmwareScreen.cpp @@ -103,6 +103,11 @@ void FirmwareScreen::CreateContentViews(UI::ViewGroup *parent) { // The description needs no scan, so it's there while loading too. list->Add(new HintView(sy->T("FirmwareSources", "Installing a PSP firmware can improve game compatibility, gives some games their proper fonts, and lets you run the XMB, the real PSP's main menu. PPSSPP works without one, but having one installed is highly recommended."))); + // Matters most when there's no firmware yet, since that's when a disc's updater gets installed. + ChoiceGroup *contentSettings = list->Add(new ChoiceGroup()); + contentSettings->Add(new CheckBox(&g_Config.bAutoUpgradeFirmware, sy->T("Install or upgrade firmware from game discs"), + sy->T("AutoUpgradeFirmwareDesc", "Most game discs carry a firmware updater. Install it when there's no firmware yet, or when the disc's is newer."))); + if (!scanned_) { auto mm = GetI18NCategory(I18NCat::MAINMENU); list->Add(new TextView(mm->T("Loading..."), ALIGN_LEFT, false)); @@ -135,10 +140,6 @@ void FirmwareScreen::CreateContentViews(UI::ViewGroup *parent) { sy->T("Some system files are present, but not a complete firmware"))); } - ChoiceGroup *contentSettings = list->Add(new ChoiceGroup()); - contentSettings->Add(new CheckBox(&g_Config.bAutoUpgradeFirmware, sy->T("Install or upgrade firmware from game discs"), - sy->T("AutoUpgradeFirmwareDesc", "Most game discs carry a firmware updater. Install it when there's no firmware yet, or when the disc's is newer."))); - // Without any kernel modules there's no firmware here to speak of - it's the fonts we pulled // off a game's disc, and rows reading "Kernel modules: 0 / XMB: No" say nothing useful. const bool fullFirmware = info_.kernelModuleCount > 0;