Sfoglia il codice sorgente

drd: Load title ID from program metadata
Previously only loaded from control metadata

Zach Hilman 8 anni fa
parent
commit
a040929c90
1 ha cambiato i file con 1 aggiunte e 3 eliminazioni
  1. 1 3
      src/core/loader/deconstructed_rom_directory.cpp

+ 1 - 3
src/core/loader/deconstructed_rom_directory.cpp

@@ -61,7 +61,6 @@ AppLoader_DeconstructedRomDirectory::AppLoader_DeconstructedRomDirectory(FileSys
 
 
     if (nacp_file != nullptr) {
     if (nacp_file != nullptr) {
         FileSys::NACP nacp(nacp_file);
         FileSys::NACP nacp(nacp_file);
-        title_id = nacp.GetTitleId();
         name = nacp.GetApplicationName();
         name = nacp.GetApplicationName();
     }
     }
 }
 }
@@ -120,6 +119,7 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load(
     }
     }
 
 
     auto& kernel = Core::System::GetInstance().Kernel();
     auto& kernel = Core::System::GetInstance().Kernel();
+    title_id = metadata.GetTitleID();
     process->program_id = metadata.GetTitleID();
     process->program_id = metadata.GetTitleID();
     process->svc_access_mask.set();
     process->svc_access_mask.set();
     process->resource_limit =
     process->resource_limit =
@@ -159,8 +159,6 @@ ResultStatus AppLoader_DeconstructedRomDirectory::ReadIcon(std::vector<u8>& buff
 }
 }
 
 
 ResultStatus AppLoader_DeconstructedRomDirectory::ReadProgramId(u64& out_program_id) {
 ResultStatus AppLoader_DeconstructedRomDirectory::ReadProgramId(u64& out_program_id) {
-    if (name.empty())
-        return ResultStatus::ErrorNoControl;
     out_program_id = title_id;
     out_program_id = title_id;
     return ResultStatus::Success;
     return ResultStatus::Success;
 }
 }