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/nca.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/nca.cpp')
| -rw-r--r-- | src/core/loader/nca.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/loader/nca.cpp b/src/core/loader/nca.cpp index 5a0469978..50d7a0f32 100644 --- a/src/core/loader/nca.cpp +++ b/src/core/loader/nca.cpp @@ -31,7 +31,7 @@ FileType AppLoader_NCA::IdentifyType(const FileSys::VirtualFile& file) { return FileType::Error; } -AppLoader_NCA::LoadResult AppLoader_NCA::Load(Kernel::Process& process) { +AppLoader_NCA::LoadResult AppLoader_NCA::Load(Kernel::Process& process, Core::System& system) { if (is_loaded) { return {ResultStatus::ErrorAlreadyLoaded, {}}; } @@ -52,13 +52,13 @@ AppLoader_NCA::LoadResult AppLoader_NCA::Load(Kernel::Process& process) { directory_loader = std::make_unique<AppLoader_DeconstructedRomDirectory>(exefs, true); - const auto load_result = directory_loader->Load(process); + const auto load_result = directory_loader->Load(process, system); if (load_result.first != ResultStatus::Success) { return load_result; } if (nca->GetRomFS() != nullptr && nca->GetRomFS()->GetSize() > 0) { - Core::System::GetInstance().GetFileSystemController().RegisterRomFS( + system.GetFileSystemController().RegisterRomFS( std::make_unique<FileSys::RomFSFactory>(*this)); } |