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 fix android nand install

This commit is contained in:
Maufeat 2026-02-05 17:50:04 +01:00
parent ba94b98780
commit bc97c083a2
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/android/app/src/main/java/org/yuzu/yuzu_emu/model/AddonViewModel.kt
View File

@ -72,21 +72,15 @@ class AddonViewModel : ViewModel() {
val enabledUpdates = updates.filter { it.enabled }
if (enabledUpdates.size > 1) {
var foundFirst = false
for (patch in patchList) {
if (PatchType.from(patch.type) == PatchType.Update) {
if (!foundFirst && patch.enabled) {
foundFirst = true
} else if (foundFirst && patch.enabled) {
patch.enabled = false
}
}
val nandOrSdmcEnabled = enabledUpdates.find {
it.name.contains("(NAND)") || it.name.contains("(SDMC)")
}
} else if (enabledUpdates.isEmpty()) {
val updateToKeep = nandOrSdmcEnabled ?: enabledUpdates.first()
for (patch in patchList) {
if (PatchType.from(patch.type) == PatchType.Update) {
patch.enabled = true
break
patch.enabled = (patch === updateToKeep)
}
}
}
@ -143,9 +137,14 @@ class AddonViewModel : ViewModel() {
if (it.enabled) {
null
} else {
// For multiple updates, use "Update@{numericVersion}" as the key (like desktop)
if (hasMultipleUpdates && PatchType.from(it.type) == PatchType.Update) {
"Update@${it.numericVersion}"
if (PatchType.from(it.type) == PatchType.Update) {
if (it.name.contains("(NAND)") || it.name.contains("(SDMC)")) {
it.name
} else if (hasMultipleUpdates) {
"Update@${it.numericVersion}"
} else {
it.name
}
} else {
it.name
}

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

@ -785,7 +785,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
std::string patch_name = "Update" + source_suffix;
const auto update_disabled =
bool update_disabled =
std::find(disabled.cbegin(), disabled.cend(), patch_name) != disabled.cend();
Patch update_patch = {.enabled = !update_disabled,
@ -804,7 +804,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
const auto metadata = update.GetControlMetadata();
const auto& nacp = metadata.first;
const auto update_disabled =
bool update_disabled =
std::find(disabled.cbegin(), disabled.cend(), "Update") != disabled.cend();
Patch update_patch = {.enabled = !update_disabled,
.name = "Update",