diff options
author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2020-09-16 22:59:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-16 22:59:44 +0200 |
commit | b0ae8265ea0aea16bfe37dce96cc3f758fd35feb (patch) | |
tree | 735e838e0e271449cecaedc6977c1831c9e39a3a /src/core/loader/xci.cpp | |
parent | Merge pull request #4658 from lioncash/copy3 (diff) | |
parent | core/loader: Remove dependencies on the global system instance (diff) | |
download | yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.tar yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.tar.gz yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.tar.bz2 yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.tar.lz yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.tar.xz yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.tar.zst yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.zip |
Diffstat (limited to 'src/core/loader/xci.cpp')
-rw-r--r-- | src/core/loader/xci.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp index 7186ad1ff..25e83af0f 100644 --- a/src/core/loader/xci.cpp +++ b/src/core/loader/xci.cpp @@ -49,7 +49,7 @@ FileType AppLoader_XCI::IdentifyType(const FileSys::VirtualFile& file) { return FileType::Error; } -AppLoader_XCI::LoadResult AppLoader_XCI::Load(Kernel::Process& process) { +AppLoader_XCI::LoadResult AppLoader_XCI::Load(Kernel::Process& process, Core::System& system) { if (is_loaded) { return {ResultStatus::ErrorAlreadyLoaded, {}}; } @@ -66,15 +66,14 @@ AppLoader_XCI::LoadResult AppLoader_XCI::Load(Kernel::Process& process) { return {ResultStatus::ErrorMissingProductionKeyFile, {}}; } - const auto result = nca_loader->Load(process); + const auto result = nca_loader->Load(process, system); if (result.first != ResultStatus::Success) { return result; } FileSys::VirtualFile update_raw; if (ReadUpdateRaw(update_raw) == ResultStatus::Success && update_raw != nullptr) { - Core::System::GetInstance().GetFileSystemController().SetPackedUpdate( - std::move(update_raw)); + system.GetFileSystemController().SetPackedUpdate(std::move(update_raw)); } is_loaded = true; |