summaryrefslogtreecommitdiffstats
path: root/src/core/loader/xci.cpp
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-08-25 17:48:23 +0200
committerZach Hilman <zachhilman@gmail.com>2018-09-04 20:27:33 +0200
commit5c8aff984e47c0f471e9eafd071031bc49ad8efc (patch)
treeac5ecdfc187f04a677b61f62eea6d6614326e636 /src/core/loader/xci.cpp
parentfile_sys: Add Nintendo Submission Package (NSP) (diff)
downloadyuzu-5c8aff984e47c0f471e9eafd071031bc49ad8efc.tar
yuzu-5c8aff984e47c0f471e9eafd071031bc49ad8efc.tar.gz
yuzu-5c8aff984e47c0f471e9eafd071031bc49ad8efc.tar.bz2
yuzu-5c8aff984e47c0f471e9eafd071031bc49ad8efc.tar.lz
yuzu-5c8aff984e47c0f471e9eafd071031bc49ad8efc.tar.xz
yuzu-5c8aff984e47c0f471e9eafd071031bc49ad8efc.tar.zst
yuzu-5c8aff984e47c0f471e9eafd071031bc49ad8efc.zip
Diffstat (limited to '')
-rw-r--r--src/core/loader/xci.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp
index 9dc4d1f35..75b998faa 100644
--- a/src/core/loader/xci.cpp
+++ b/src/core/loader/xci.cpp
@@ -17,8 +17,7 @@ namespace Loader {
AppLoader_XCI::AppLoader_XCI(FileSys::VirtualFile file)
: AppLoader(file), xci(std::make_unique<FileSys::XCI>(file)),
- nca_loader(std::make_unique<AppLoader_NCA>(
- xci->GetNCAFileByType(FileSys::NCAContentType::Program))) {
+ nca_loader(std::make_unique<AppLoader_NCA>(xci->GetProgramNCAFile())) {
if (xci->GetStatus() != ResultStatus::Success)
return;
const auto control_nca = xci->GetNCAByType(FileSys::NCAContentType::Control);
@@ -64,11 +63,11 @@ ResultStatus AppLoader_XCI::Load(Kernel::SharedPtr<Kernel::Process>& process) {
if (xci->GetProgramNCAStatus() != ResultStatus::Success)
return xci->GetProgramNCAStatus();
- const auto nca = xci->GetNCAFileByType(FileSys::NCAContentType::Program);
+ const auto nca = xci->GetProgramNCA();
if (nca == nullptr && !Core::Crypto::KeyManager::KeyFileExists(false))
return ResultStatus::ErrorMissingProductionKeyFile;
- auto result = nca_loader->Load(process);
+ const auto result = nca_loader->Load(process);
if (result != ResultStatus::Success)
return result;