summaryrefslogtreecommitdiffstats
path: root/src/core/file_sys
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-10-16 17:36:55 +0200
committerLioncash <mathew1800@gmail.com>2018-10-16 17:36:58 +0200
commit73e1e929a2aecdb26b9db8ea9a418a3f4e9c1365 (patch)
tree56438cca62e87575958db23380e557143151675d /src/core/file_sys
parentMerge pull request #1443 from DarkLordZach/lower-loader-logs-1 (diff)
downloadyuzu-73e1e929a2aecdb26b9db8ea9a418a3f4e9c1365.tar
yuzu-73e1e929a2aecdb26b9db8ea9a418a3f4e9c1365.tar.gz
yuzu-73e1e929a2aecdb26b9db8ea9a418a3f4e9c1365.tar.bz2
yuzu-73e1e929a2aecdb26b9db8ea9a418a3f4e9c1365.tar.lz
yuzu-73e1e929a2aecdb26b9db8ea9a418a3f4e9c1365.tar.xz
yuzu-73e1e929a2aecdb26b9db8ea9a418a3f4e9c1365.tar.zst
yuzu-73e1e929a2aecdb26b9db8ea9a418a3f4e9c1365.zip
Diffstat (limited to 'src/core/file_sys')
-rw-r--r--src/core/file_sys/card_image.cpp10
-rw-r--r--src/core/file_sys/card_image.h2
2 files changed, 7 insertions, 5 deletions
diff --git a/src/core/file_sys/card_image.cpp b/src/core/file_sys/card_image.cpp
index 8f5142a07..ecdd7505b 100644
--- a/src/core/file_sys/card_image.cpp
+++ b/src/core/file_sys/card_image.cpp
@@ -122,14 +122,16 @@ u64 XCI::GetProgramTitleID() const {
return secure_partition->GetProgramTitleID();
}
-std::shared_ptr<NCA> XCI::GetProgramNCA() const {
- return program;
+bool XCI::HasProgramNCA() const {
+ return program != nullptr;
}
VirtualFile XCI::GetProgramNCAFile() const {
- if (GetProgramNCA() == nullptr)
+ if (!HasProgramNCA()) {
return nullptr;
- return GetProgramNCA()->GetBaseFile();
+ }
+
+ return program->GetBaseFile();
}
const std::vector<std::shared_ptr<NCA>>& XCI::GetNCAs() const {
diff --git a/src/core/file_sys/card_image.h b/src/core/file_sys/card_image.h
index ce514dfa0..48cbef666 100644
--- a/src/core/file_sys/card_image.h
+++ b/src/core/file_sys/card_image.h
@@ -80,7 +80,7 @@ public:
u64 GetProgramTitleID() const;
- std::shared_ptr<NCA> GetProgramNCA() const;
+ bool HasProgramNCA() const;
VirtualFile GetProgramNCAFile() const;
const std::vector<std::shared_ptr<NCA>>& GetNCAs() const;
std::shared_ptr<NCA> GetNCAByType(NCAContentType type) const;