camerin
/
eden
mirror of https://git.eden-emu.dev/eden-emu/eden.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try to fix NAND updates

This commit is contained in:
Maufeat 2026-02-05 05:30:52 +01:00
parent 3f0c9534b5
commit bbaa16efe8
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/core/file_sys/patch_manager.cpp
View File

@ -188,16 +188,23 @@ VirtualDir PatchManager::PatchExeFS(VirtualDir exefs) const {
}
// check for original NAND style
// BUT only if we didn't check external provider (to avoid loading wrong update)
if (!checked_external && !checked_manual && update_disabled) {
if (std::find(disabled.cbegin(), disabled.cend(), "Update") == disabled.cend()) {
// Check NAND if: no external updates exist, OR all external updates are disabled
if (!checked_external && !checked_manual) {
// Check if any NAND-style update is enabled
const bool nand_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (NAND)") != disabled.cend();
const bool sdmc_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (SDMC)") != disabled.cend();
const bool generic_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update") != disabled.cend();
if (!nand_disabled || !sdmc_disabled || !generic_disabled) {
update_disabled = false;
}
if (std::find(disabled.cbegin(), disabled.cend(), "Update (NAND)") == disabled.cend()) {
update_disabled = false;
}
if (std::find(disabled.cbegin(), disabled.cend(), "Update (SDMC)") == disabled.cend()) {
} else if (update_disabled) {
const bool nand_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (NAND)") != disabled.cend();
const bool sdmc_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (SDMC)") != disabled.cend();
if (!nand_disabled || !sdmc_disabled) {
update_disabled = false;
enabled_version = std::nullopt;
}
}
@ -228,7 +235,7 @@ VirtualDir PatchManager::PatchExeFS(VirtualDir exefs) const {
}
// Fallback to regular content provider - but only if we didn't check external
if (update == nullptr && !checked_external && !checked_manual) {
if (update == nullptr && !update_disabled) {
update = content_provider.GetEntry(update_tid, ContentRecordType::Program);
}
@ -586,15 +593,26 @@ VirtualFile PatchManager::PatchRomFS(const NCA* base_nca, VirtualFile base_romfs
}
}
if (!checked_external && !checked_manual && update_disabled) {
if (std::find(disabled.cbegin(), disabled.cend(), "Update") == disabled.cend() ||
std::find(disabled.cbegin(), disabled.cend(), "Update (NAND)") == disabled.cend() ||
std::find(disabled.cbegin(), disabled.cend(), "Update (SDMC)") == disabled.cend()) {
if (!checked_external && !checked_manual) {
const bool nand_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (NAND)") != disabled.cend();
const bool sdmc_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (SDMC)") != disabled.cend();
const bool generic_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update") != disabled.cend();
if (!nand_disabled || !sdmc_disabled || !generic_disabled) {
update_disabled = false;
}
if (!update_disabled && update_raw == nullptr) {
update_raw = content_provider.GetEntryRaw(update_tid, type);
}
} else if (update_disabled) {
const bool nand_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (NAND)") != disabled.cend();
const bool sdmc_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (SDMC)") != disabled.cend();
if (!nand_disabled || !sdmc_disabled) {
update_disabled = false;
enabled_version = std::nullopt;
update_raw = content_provider.GetEntryRaw(update_tid, type);
}
}
if (!update_disabled && update_raw != nullptr && base_nca != nullptr) {

8
src/yuzu/configuration/configure_per_game_addons.cpp
View File

@ -169,12 +169,16 @@ void ConfigurePerGameAddons::LoadConfiguration() {
first_item->setText(name);
first_item->setCheckable(true);
if (patch.type == FileSys::PatchType::Update && patch.numeric_version != 0) {
const bool is_external_update = patch.type == FileSys::PatchType::Update &&
patch.source == FileSys::PatchSource::External &&
patch.numeric_version != 0;
if (is_external_update) {
first_item->setData(static_cast<quint32>(patch.numeric_version), Qt::UserRole);
}
bool patch_disabled = false;
if (patch.type == FileSys::PatchType::Update && patch.numeric_version != 0) {
if (is_external_update) {
std::string disabled_key = fmt::format("Update@{}", patch.numeric_version);
patch_disabled = std::find(disabled.begin(), disabled.end(), disabled_key) != disabled.end();
} else {