aboutsummaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-08-04 14:33:11 -0400
committerGitHub <noreply@github.com>2018-08-04 14:33:11 -0400
commit4c42134b094aa4291bc92270cece2e0f7be0ca14 (patch)
tree222cc27ecbc7f7e86d2edef8d36436600dee7d7a /src/core/core.cpp
parenta43ae368d3cf003fd682536c47f111b2d4d4e9ca (diff)
parent5b9d48ba4317c976c18ea03d3146d8b5c69a86fc (diff)
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.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 9824769cfa..e51e665501 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
static_cast<int>(system_mode.second));
switch (system_mode.second) {
- case Loader::ResultStatus::ErrorEncrypted:
- return ResultStatus::ErrorLoader_ErrorEncrypted;
+ case Loader::ResultStatus::ErrorMissingKeys:
+ return ResultStatus::ErrorLoader_ErrorMissingKeys;
+ case Loader::ResultStatus::ErrorDecrypting:
+ return ResultStatus::ErrorLoader_ErrorDecrypting;
case Loader::ResultStatus::ErrorInvalidFormat:
return ResultStatus::ErrorLoader_ErrorInvalidFormat;
case Loader::ResultStatus::ErrorUnsupportedArch:
@@ -124,8 +126,10 @@ System::ResultStatus System::Load(EmuWindow& emu_window, const std::string& file
System::Shutdown();
switch (load_result) {
- case Loader::ResultStatus::ErrorEncrypted:
- return ResultStatus::ErrorLoader_ErrorEncrypted;
+ case Loader::ResultStatus::ErrorMissingKeys:
+ return ResultStatus::ErrorLoader_ErrorMissingKeys;
+ case Loader::ResultStatus::ErrorDecrypting:
+ return ResultStatus::ErrorLoader_ErrorDecrypting;
case Loader::ResultStatus::ErrorInvalidFormat:
return ResultStatus::ErrorLoader_ErrorInvalidFormat;
case Loader::ResultStatus::ErrorUnsupportedArch: