summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Zach Hilman2018-08-25 11:44:52 -0400
committerGravatar Zach Hilman2018-09-04 14:25:54 -0400
commita040929c90055b520d52fc062b297578ab119800 (patch)
tree6b7a632d3cab4473b74f7d55ddfbb169a66fb6c8 /src
parentloader: Add NSP file type and NSP-specific errors (diff)
downloadyuzu-a040929c90055b520d52fc062b297578ab119800.tar.gz
yuzu-a040929c90055b520d52fc062b297578ab119800.tar.xz
yuzu-a040929c90055b520d52fc062b297578ab119800.zip
drd: Load title ID from program metadata
Previously only loaded from control metadata
Diffstat (limited to 'src')
-rw-r--r--src/core/loader/deconstructed_rom_directory.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp
index 921b899e2..1ae4bb656 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
61 61
62 if (nacp_file != nullptr) { 62 if (nacp_file != nullptr) {
63 FileSys::NACP nacp(nacp_file); 63 FileSys::NACP nacp(nacp_file);
64 title_id = nacp.GetTitleId();
65 name = nacp.GetApplicationName(); 64 name = nacp.GetApplicationName();
66 } 65 }
67} 66}
@@ -120,6 +119,7 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load(
120 } 119 }
121 120
122 auto& kernel = Core::System::GetInstance().Kernel(); 121 auto& kernel = Core::System::GetInstance().Kernel();
122 title_id = metadata.GetTitleID();
123 process->program_id = metadata.GetTitleID(); 123 process->program_id = metadata.GetTitleID();
124 process->svc_access_mask.set(); 124 process->svc_access_mask.set();
125 process->resource_limit = 125 process->resource_limit =
@@ -159,8 +159,6 @@ ResultStatus AppLoader_DeconstructedRomDirectory::ReadIcon(std::vector<u8>& buff
159} 159}
160 160
161ResultStatus AppLoader_DeconstructedRomDirectory::ReadProgramId(u64& out_program_id) { 161ResultStatus AppLoader_DeconstructedRomDirectory::ReadProgramId(u64& out_program_id) {
162 if (name.empty())
163 return ResultStatus::ErrorNoControl;
164 out_program_id = title_id; 162 out_program_id = title_id;
165 return ResultStatus::Success; 163 return ResultStatus::Success;
166} 164}