VERY experimental Nintendo Switch 2 emulator
C++
[file_sys] fix romfs_ext mods (#3914)
smiRaphi28a2ff1b9474
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/AddonUtil.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/AddonUtil.ktindex b5613a7a76..60bdaefe9b 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/AddonUtil.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/AddonUtil.kt@@ -1,4 +1,4 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later// SPDX-FileCopyrightText: 2023 yuzu Emulator Project@@ -7,5 +7,5 @@package org.yuzu.yuzu_emu.utilsobject AddonUtil {- val validAddonDirectories = listOf("cheats", "exefs", "romfs", "romfslite")+ val validAddonDirectories = listOf("cheats", "exefs", "romfs", "romfslite", "romfs_ext")}diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cppindex 6af926eac0..80372ec94e 100644--- a/src/core/file_sys/patch_manager.cpp+++ b/src/core/file_sys/patch_manager.cpp@@ -569,12 +569,11 @@ static void ApplyLayeredFS(VirtualFile& romfs, u64 title_id, ContentRecordType tlayers.emplace_back(std::move(extracted));auto layered = LayeredVfsDirectory::MakeLayeredDirectory(std::move(layers));- if (layered == nullptr) {+ auto layered_ext = LayeredVfsDirectory::MakeLayeredDirectory(std::move(layers_ext));+ if (layered == nullptr && layered_ext == nullptr) {return;}- auto layered_ext = LayeredVfsDirectory::MakeLayeredDirectory(std::move(layers_ext));-auto packed = CreateRomFS(std::move(layered), std::move(layered_ext));if (packed == nullptr) {return;@@ -943,6 +942,8 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {if (IsDirValidAndNonEmpty(FindSubdirectoryCaseless(mod, "romfs")) ||IsDirValidAndNonEmpty(FindSubdirectoryCaseless(mod, "romfslite")))AppendCommaIfNotEmpty(types, "LayeredFS");+ if (IsDirValidAndNonEmpty(FindSubdirectoryCaseless(mod, "romfs_ext")))+ AppendCommaIfNotEmpty(types, "ExtLayeredFS");if (IsDirValidAndNonEmpty(FindSubdirectoryCaseless(mod, "cheats")))AppendCommaIfNotEmpty(types, "Cheats");@@ -965,13 +966,13 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {const auto sdmc_mod_dir = fs_controller.GetSDMCModificationLoadRoot(title_id);if (sdmc_mod_dir != nullptr) {std::string types;- if (IsDirValidAndNonEmpty(FindSubdirectoryCaseless(sdmc_mod_dir, "exefs"))) {+ if (IsDirValidAndNonEmpty(FindSubdirectoryCaseless(sdmc_mod_dir, "exefs")))AppendCommaIfNotEmpty(types, "LayeredExeFS");- }if (IsDirValidAndNonEmpty(FindSubdirectoryCaseless(sdmc_mod_dir, "romfs")) ||- IsDirValidAndNonEmpty(FindSubdirectoryCaseless(sdmc_mod_dir, "romfslite"))) {+ IsDirValidAndNonEmpty(FindSubdirectoryCaseless(sdmc_mod_dir, "romfslite")))AppendCommaIfNotEmpty(types, "LayeredFS");- }+ if (IsDirValidAndNonEmpty(FindSubdirectoryCaseless(sdmc_mod_dir, "romfs_ext")))+ AppendCommaIfNotEmpty(types, "ExtLayeredFS");if (!types.empty()) {const auto mod_disabled =