summaryrefslogtreecommitdiffstats
path: root/src/core/loader/ncch.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/loader/ncch.cpp')
-rw-r--r--src/core/loader/ncch.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index beeb13ffa..1a20762e4 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -121,12 +121,19 @@ FileType AppLoader_NCCH::IdentifyType(FileUtil::IOFile& file) {
return FileType::Error;
}
-boost::optional<u32> AppLoader_NCCH::LoadKernelSystemMode() {
+ResultStatus AppLoader_NCCH::LoadKernelSystemMode(boost::optional<u32>& system_mode) {
if (!is_loaded) {
- if (LoadExeFS() != ResultStatus::Success)
- return boost::none;
+ ResultStatus res = LoadExeFS();
+ if (res != ResultStatus::Success) {
+ // Set the system mode as invalid.
+ system_mode = boost::none;
+ // Return the error code.
+ return res;
+ }
}
- return exheader_header.arm11_system_local_caps.system_mode.Value();
+ // Set the system mode as the one from the exheader.
+ system_mode = exheader_header.arm11_system_local_caps.system_mode.Value();
+ return ResultStatus::Success;
}
ResultStatus AppLoader_NCCH::LoadExec() {