summaryrefslogtreecommitdiff
path: root/src/core/loader/xci.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2020-11-24 15:27:22 -0800
committerGravatar GitHub2020-11-24 15:27:22 -0800
commit0832da3e4054d0b47c39e95553b5f3be5848eae9 (patch)
tree1e7688670225c60bbcbc2827cf427a67e1686404 /src/core/loader/xci.cpp
parenthle: services: Fix a crash with improper NVFlinger lifetime management. (#4977) (diff)
parentfrontend: yuzu (qt): Register a callback for ExecuteProgram. (diff)
downloadyuzu-0832da3e4054d0b47c39e95553b5f3be5848eae9.tar.gz
yuzu-0832da3e4054d0b47c39e95553b5f3be5848eae9.tar.xz
yuzu-0832da3e4054d0b47c39e95553b5f3be5848eae9.zip
Merge pull request #4799 from bunnei/execute-program
core: Refactor loader and implement ExecuteProgram
Diffstat (limited to 'src/core/loader/xci.cpp')
-rw-r--r--src/core/loader/xci.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp
index 536e721fc..aaa250cea 100644
--- a/src/core/loader/xci.cpp
+++ b/src/core/loader/xci.cpp
@@ -22,8 +22,9 @@ namespace Loader {
22 22
23AppLoader_XCI::AppLoader_XCI(FileSys::VirtualFile file, 23AppLoader_XCI::AppLoader_XCI(FileSys::VirtualFile file,
24 const Service::FileSystem::FileSystemController& fsc, 24 const Service::FileSystem::FileSystemController& fsc,
25 const FileSys::ContentProvider& content_provider) 25 const FileSys::ContentProvider& content_provider,
26 : AppLoader(file), xci(std::make_unique<FileSys::XCI>(file)), 26 std::size_t program_index)
27 : AppLoader(file), xci(std::make_unique<FileSys::XCI>(file, program_index)),
27 nca_loader(std::make_unique<AppLoader_NCA>(xci->GetProgramNCAFile())) { 28 nca_loader(std::make_unique<AppLoader_NCA>(xci->GetProgramNCAFile())) {
28 if (xci->GetStatus() != ResultStatus::Success) { 29 if (xci->GetStatus() != ResultStatus::Success) {
29 return; 30 return;