summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-09-22 01:36:46 +0200
committerGitHub <noreply@github.com>2020-09-22 01:36:46 +0200
commit53829d4cbd6cc84963191a483688d407ec6fe14d (patch)
tree34bf8190e3b1e396fc4a75acead047b1bfbbc748
parentMerge pull request #4692 from ReinUsesLisp/remove-vsync (diff)
parentsubmission_package: Account for multi-content NSPs (diff)
downloadyuzu-53829d4cbd6cc84963191a483688d407ec6fe14d.tar
yuzu-53829d4cbd6cc84963191a483688d407ec6fe14d.tar.gz
yuzu-53829d4cbd6cc84963191a483688d407ec6fe14d.tar.bz2
yuzu-53829d4cbd6cc84963191a483688d407ec6fe14d.tar.lz
yuzu-53829d4cbd6cc84963191a483688d407ec6fe14d.tar.xz
yuzu-53829d4cbd6cc84963191a483688d407ec6fe14d.tar.zst
yuzu-53829d4cbd6cc84963191a483688d407ec6fe14d.zip
-rw-r--r--src/core/file_sys/submission_package.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/file_sys/submission_package.cpp b/src/core/file_sys/submission_package.cpp
index b9ce93b7c..aab957bf2 100644
--- a/src/core/file_sys/submission_package.cpp
+++ b/src/core/file_sys/submission_package.cpp
@@ -267,9 +267,9 @@ void NSP::ReadNCAs(const std::vector<VirtualFile>& files) {
}
const CNMT cnmt(inner_file);
- auto& ncas_title = ncas[cnmt.GetTitleID()];
- ncas_title[{cnmt.GetType(), ContentRecordType::Meta}] = nca;
+ ncas[cnmt.GetTitleID()][{cnmt.GetType(), ContentRecordType::Meta}] = nca;
+
for (const auto& rec : cnmt.GetContentRecords()) {
const auto id_string = Common::HexToString(rec.nca_id, false);
auto next_file = pfs->GetFile(fmt::format("{}.nca", id_string));
@@ -287,12 +287,12 @@ void NSP::ReadNCAs(const std::vector<VirtualFile>& files) {
auto next_nca = std::make_shared<NCA>(std::move(next_file), nullptr, 0);
if (next_nca->GetType() == NCAContentType::Program) {
- program_status[cnmt.GetTitleID()] = next_nca->GetStatus();
+ program_status[next_nca->GetTitleId()] = next_nca->GetStatus();
}
if (next_nca->GetStatus() == Loader::ResultStatus::Success ||
(next_nca->GetStatus() == Loader::ResultStatus::ErrorMissingBKTRBaseRomFS &&
- (cnmt.GetTitleID() & 0x800) != 0)) {
- ncas_title[{cnmt.GetType(), rec.type}] = std::move(next_nca);
+ (next_nca->GetTitleId() & 0x800) != 0)) {
+ ncas[next_nca->GetTitleId()][{cnmt.GetType(), rec.type}] = std::move(next_nca);
}
}