VERY experimental Nintendo Switch 2 emulator
C++
file_sys: tolerate empty NCA
Liama1ea1c3dd366
diff --git a/src/core/file_sys/card_image.cpp b/src/core/file_sys/card_image.cppindex 4920905a69..3b2588c840 100644--- a/src/core/file_sys/card_image.cpp+++ b/src/core/file_sys/card_image.cpp@@ -185,7 +185,7 @@ u32 XCI::GetSystemUpdateVersion() {for (const auto& update_file : update->GetFiles()) {NCA nca{update_file};- if (nca.GetStatus() != Loader::ResultStatus::Success) {+ if (nca.GetStatus() != Loader::ResultStatus::Success || nca.GetSubdirectories().empty()) {continue;}diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cppindex e4218523a2..a28af35947 100644--- a/src/core/file_sys/registered_cache.cpp+++ b/src/core/file_sys/registered_cache.cpp@@ -418,7 +418,7 @@ void RegisteredCache::ProcessFiles(const std::vector<NcaID>& ids) {continue;const auto nca = std::make_shared<NCA>(parser(file, id));if (nca->GetStatus() != Loader::ResultStatus::Success ||- nca->GetType() != NCAContentType::Meta) {+ nca->GetType() != NCAContentType::Meta || nca->GetSubdirectories().empty()) {continue;}diff --git a/src/core/file_sys/submission_package.cpp b/src/core/file_sys/submission_package.cppindex 73582ad50f..e1e89ce2db 100644--- a/src/core/file_sys/submission_package.cpp+++ b/src/core/file_sys/submission_package.cpp@@ -249,7 +249,7 @@ void NSP::ReadNCAs(const std::vector<VirtualFile>& files) {}const auto nca = std::make_shared<NCA>(outer_file);- if (nca->GetStatus() != Loader::ResultStatus::Success) {+ if (nca->GetStatus() != Loader::ResultStatus::Success || nca->GetSubdirectories().empty()) {program_status[nca->GetTitleId()] = nca->GetStatus();continue;}