VERY experimental Nintendo Switch 2 emulator
C++
loader: don't reassign program ID on npdm reparse
Liambb4e14e7acee
diff --git a/src/core/file_sys/program_metadata.cpp b/src/core/file_sys/program_metadata.cppindex f00479bd35..8e291ff676 100644--- a/src/core/file_sys/program_metadata.cpp+++ b/src/core/file_sys/program_metadata.cpp@@ -5,6 +5,7 @@#include <vector>#include "common/logging/log.h"+#include "common/scope_exit.h"#include "core/file_sys/program_metadata.h"#include "core/file_sys/vfs.h"#include "core/loader/loader.h"@@ -95,6 +96,13 @@ Loader::ResultStatus ProgramMetadata::Load(VirtualFile file) {return Loader::ResultStatus::Success;}+Loader::ResultStatus ProgramMetadata::Reload(VirtualFile file) {+ const u64 original_program_id = aci_header.title_id;+ SCOPE_EXIT({ aci_header.title_id = original_program_id; });++ return this->Load(file);+}+/*static*/ ProgramMetadata ProgramMetadata::GetDefault() {// Allow use of cores 0~3 and thread priorities 1~63.constexpr u32 default_thread_info_capability = 0x30007F7;diff --git a/src/core/file_sys/program_metadata.h b/src/core/file_sys/program_metadata.hindex 2e8960b076..9f8e74b13a 100644--- a/src/core/file_sys/program_metadata.h+++ b/src/core/file_sys/program_metadata.h@@ -56,6 +56,7 @@ public:static ProgramMetadata GetDefault();Loader::ResultStatus Load(VirtualFile file);+ Loader::ResultStatus Reload(VirtualFile file);/// Load from parameters instead of NPDM file, used for KIPvoid LoadManual(bool is_64_bit, ProgramAddressSpaceType address_space, s32 main_thread_prio,diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cppindex 5a42dea486..5c36b71e53 100644--- a/src/core/loader/deconstructed_rom_directory.cpp+++ b/src/core/loader/deconstructed_rom_directory.cpp@@ -118,7 +118,7 @@ AppLoader_DeconstructedRomDirectory::LoadResult AppLoader_DeconstructedRomDirectreturn {ResultStatus::ErrorMissingNPDM, {}};}- const ResultStatus result2 = metadata.Load(npdm);+ const ResultStatus result2 = metadata.Reload(npdm);if (result2 != ResultStatus::Success) {return {result2, {}};}