From a040929c90055b520d52fc062b297578ab119800 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Sat, 25 Aug 2018 11:44:52 -0400
Subject: [PATCH] drd: Load title ID from program metadata Previously only
loaded from control metadata
---
src/core/loader/deconstructed_rom_directory.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp
index 921b899e2d..1ae4bb656f 100644
--- a/src/core/loader/deconstructed_rom_directory.cpp
+++ b/src/core/loader/deconstructed_rom_directory.cpp
@@ -61,7 +61,6 @@ AppLoader_DeconstructedRomDirectory::AppLoader_DeconstructedRomDirectory(FileSys
if (nacp_file != nullptr) {
FileSys::NACP nacp(nacp_file);
- title_id = nacp.GetTitleId();
name = nacp.GetApplicationName();
}
}
@@ -120,6 +119,7 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load(
}
auto& kernel = Core::System::GetInstance().Kernel();
+ title_id = metadata.GetTitleID();
process->program_id = metadata.GetTitleID();
process->svc_access_mask.set();
process->resource_limit =
@@ -159,8 +159,6 @@ ResultStatus AppLoader_DeconstructedRomDirectory::ReadIcon(std::vector<u8>& buff
}
ResultStatus AppLoader_DeconstructedRomDirectory::ReadProgramId(u64& out_program_id) {
- if (name.empty())
- return ResultStatus::ErrorNoControl;
out_program_id = title_id;
return ResultStatus::Success;
}