diff options
| author | shinyquagsire23 <mtinc2@gmail.com> | 2018-02-25 15:01:37 +0100 |
|---|---|---|
| committer | shinyquagsire23 <mtinc2@gmail.com> | 2018-02-25 15:41:36 +0100 |
| commit | 487f8bc01816e108882e03901f2372f8d8653d7d (patch) | |
| tree | a798b0594770433de8e8f4338f9930be14063e65 /src/core/loader/deconstructed_rom_directory.cpp | |
| parent | loader: Use NPDM information when loading NSOs (diff) | |
| download | yuzu-487f8bc01816e108882e03901f2372f8d8653d7d.tar yuzu-487f8bc01816e108882e03901f2372f8d8653d7d.tar.gz yuzu-487f8bc01816e108882e03901f2372f8d8653d7d.tar.bz2 yuzu-487f8bc01816e108882e03901f2372f8d8653d7d.tar.lz yuzu-487f8bc01816e108882e03901f2372f8d8653d7d.tar.xz yuzu-487f8bc01816e108882e03901f2372f8d8653d7d.tar.zst yuzu-487f8bc01816e108882e03901f2372f8d8653d7d.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/loader/deconstructed_rom_directory.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index 83666eb86..864cf25cd 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp @@ -114,7 +114,11 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load( const std::string directory = filepath.substr(0, filepath.find_last_of("/\\")) + DIR_SEP; const std::string npdm_path = directory + DIR_SEP + "main.npdm"; - metadata.Load(npdm_path); + + ResultStatus result = metadata.Load(npdm_path); + if (result != ResultStatus::Success) { + return result; + } metadata.Print(); // Load NSO modules @@ -123,7 +127,7 @@ ResultStatus AppLoader_DeconstructedRomDirectory::Load( "subsdk4", "subsdk5", "subsdk6", "subsdk7", "sdk"}) { const std::string path = directory + DIR_SEP + module; const VAddr load_addr = next_load_addr; - next_load_addr = AppLoader_NSO::LoadModule(path, load_addr); + next_load_addr = AppLoader_NSO::LoadModule(path, load_addr, metadata.GetTitleID()); if (next_load_addr) { LOG_DEBUG(Loader, "loaded module %s @ 0x%" PRIx64, module, load_addr); } else { |