diff options
| author |  Mat M | 2018-08-24 23:47:46 -0400 |
|---|---|---|
| committer |  GitHub | 2018-08-24 23:47:46 -0400 |
| commit | 6426b0f5514d6a7c5cc369368947eceb380bfc85 (patch) | |
| tree | b7acdc39a4344570a6f2c098c30ad20114bf84db /src/core/loader/xci.cpp | |
| parent | Merge pull request #1065 from DarkLordZach/window-title (diff) | |
| parent | file_sys/crypto: Fix missing/unnecessary includes (diff) | |
| download | yuzu-6426b0f5514d6a7c5cc369368947eceb380bfc85.tar.gz yuzu-6426b0f5514d6a7c5cc369368947eceb380bfc85.tar.xz yuzu-6426b0f5514d6a7c5cc369368947eceb380bfc85.zip | |
Merge pull request #1094 from DarkLordZach/nax0
file_sys: Add support for NAX archives
Diffstat (limited to 'src/core/loader/xci.cpp')
| -rw-r--r-- | src/core/loader/xci.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp index 4c4979545..9dc4d1f35 100644 --- a/src/core/loader/xci.cpp +++ b/src/core/loader/xci.cpp | |||
| @@ -61,11 +61,12 @@ ResultStatus AppLoader_XCI::Load(Kernel::SharedPtr<Kernel::Process>& process) { | |||
| 61 | if (xci->GetStatus() != ResultStatus::Success) | 61 | if (xci->GetStatus() != ResultStatus::Success) |
| 62 | return xci->GetStatus(); | 62 | return xci->GetStatus(); |
| 63 | 63 | ||
| 64 | if (xci->GetNCAFileByType(FileSys::NCAContentType::Program) == nullptr) { | 64 | if (xci->GetProgramNCAStatus() != ResultStatus::Success) |
| 65 | if (!Core::Crypto::KeyManager::KeyFileExists(false)) | 65 | return xci->GetProgramNCAStatus(); |
| 66 | return ResultStatus::ErrorMissingProductionKeyFile; | 66 | |
| 67 | return ResultStatus::ErrorXCIMissingProgramNCA; | 67 | const auto nca = xci->GetNCAFileByType(FileSys::NCAContentType::Program); |
| 68 | } | 68 | if (nca == nullptr && !Core::Crypto::KeyManager::KeyFileExists(false)) |
| 69 | return ResultStatus::ErrorMissingProductionKeyFile; | ||
| 69 | 70 | ||
| 70 | auto result = nca_loader->Load(process); | 71 | auto result = nca_loader->Load(process); |
| 71 | if (result != ResultStatus::Success) | 72 | if (result != ResultStatus::Success) |