diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2020-09-16 20:59:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-16 20:59:44 +0000 |
| commit | b0ae8265ea0aea16bfe37dce96cc3f758fd35feb (patch) | |
| tree | 735e838e0e271449cecaedc6977c1831c9e39a3a /src/core/loader/nro.cpp | |
| parent | 004bfefeb57898ad38af6255bc6ccc6bb1e35fbd (diff) | |
| parent | 113a3972a6487430ab94f08a4a66742739ff48c2 (diff) | |
Merge pull request #4661 from lioncash/system-loader
core/loader: Remove dependencies on the global system instance
Diffstat (limited to 'src/core/loader/nro.cpp')
| -rw-r--r-- | src/core/loader/nro.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 906544bc9..5ce279f81 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp @@ -208,7 +208,7 @@ bool AppLoader_NRO::LoadNro(Kernel::Process& process, const FileSys::VfsFile& fi return LoadNroImpl(process, file.ReadAllBytes(), file.GetName()); } -AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process) { +AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process, Core::System& system) { if (is_loaded) { return {ResultStatus::ErrorAlreadyLoaded, {}}; } @@ -218,7 +218,7 @@ AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process) { } if (romfs != nullptr) { - Core::System::GetInstance().GetFileSystemController().RegisterRomFS( + system.GetFileSystemController().RegisterRomFS( std::make_unique<FileSys::RomFSFactory>(*this)); } |