diff options
| author |  bunnei | 2018-08-04 14:33:11 -0400 |
|---|---|---|
| committer |  GitHub | 2018-08-04 14:33:11 -0400 |
| commit | 2b06301dbfbfe79687219bf7783a6d1b47695401 (patch) | |
| tree | 222cc27ecbc7f7e86d2edef8d36436600dee7d7a /src/core/core.cpp | |
| parent | Merge pull request #919 from lioncash/sign (diff) | |
| parent | Add missing parameter to files.push_back() (diff) | |
| download | yuzu-2b06301dbfbfe79687219bf7783a6d1b47695401.tar.gz yuzu-2b06301dbfbfe79687219bf7783a6d1b47695401.tar.xz yuzu-2b06301dbfbfe79687219bf7783a6d1b47695401.zip | |
Merge pull request #849 from DarkLordZach/xci
XCI and Encrypted NCA Support
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 9824769cf..e51e66550 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -99,8 +99,10 @@ System::ResultStatus System::Load(EmuWindow& emu_window, const std::string& file | |||
| 99 | static_cast<int>(system_mode.second)); | 99 | static_cast<int>(system_mode.second)); |
| 100 | 100 | ||
| 101 | switch (system_mode.second) { | 101 | switch (system_mode.second) { |
| 102 | case Loader::ResultStatus::ErrorEncrypted: | 102 | case Loader::ResultStatus::ErrorMissingKeys: |
| 103 | return ResultStatus::ErrorLoader_ErrorEncrypted; | 103 | return ResultStatus::ErrorLoader_ErrorMissingKeys; |
| 104 | case Loader::ResultStatus::ErrorDecrypting: | ||
| 105 | return ResultStatus::ErrorLoader_ErrorDecrypting; | ||
| 104 | case Loader::ResultStatus::ErrorInvalidFormat: | 106 | case Loader::ResultStatus::ErrorInvalidFormat: |
| 105 | return ResultStatus::ErrorLoader_ErrorInvalidFormat; | 107 | return ResultStatus::ErrorLoader_ErrorInvalidFormat; |
| 106 | case Loader::ResultStatus::ErrorUnsupportedArch: | 108 | case Loader::ResultStatus::ErrorUnsupportedArch: |
| @@ -124,8 +126,10 @@ System::ResultStatus System::Load(EmuWindow& emu_window, const std::string& file | |||
| 124 | System::Shutdown(); | 126 | System::Shutdown(); |
| 125 | 127 | ||
| 126 | switch (load_result) { | 128 | switch (load_result) { |
| 127 | case Loader::ResultStatus::ErrorEncrypted: | 129 | case Loader::ResultStatus::ErrorMissingKeys: |
| 128 | return ResultStatus::ErrorLoader_ErrorEncrypted; | 130 | return ResultStatus::ErrorLoader_ErrorMissingKeys; |
| 131 | case Loader::ResultStatus::ErrorDecrypting: | ||
| 132 | return ResultStatus::ErrorLoader_ErrorDecrypting; | ||
| 129 | case Loader::ResultStatus::ErrorInvalidFormat: | 133 | case Loader::ResultStatus::ErrorInvalidFormat: |
| 130 | return ResultStatus::ErrorLoader_ErrorInvalidFormat; | 134 | return ResultStatus::ErrorLoader_ErrorInvalidFormat; |
| 131 | case Loader::ResultStatus::ErrorUnsupportedArch: | 135 | case Loader::ResultStatus::ErrorUnsupportedArch: |