summaryrefslogtreecommitdiff
path: root/src/core/loader/nro.cpp
diff options
context:
space:
mode:
authorGravatar Rodrigo Locatti2020-09-16 20:59:44 +0000
committerGravatar GitHub2020-09-16 20:59:44 +0000
commitb0ae8265ea0aea16bfe37dce96cc3f758fd35feb (patch)
tree735e838e0e271449cecaedc6977c1831c9e39a3a /src/core/loader/nro.cpp
parentMerge pull request #4658 from lioncash/copy3 (diff)
parentcore/loader: Remove dependencies on the global system instance (diff)
downloadyuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.tar.gz
yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.tar.xz
yuzu-b0ae8265ea0aea16bfe37dce96cc3f758fd35feb.zip
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.cpp4
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
208 return LoadNroImpl(process, file.ReadAllBytes(), file.GetName()); 208 return LoadNroImpl(process, file.ReadAllBytes(), file.GetName());
209} 209}
210 210
211AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process) { 211AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process, Core::System& system) {
212 if (is_loaded) { 212 if (is_loaded) {
213 return {ResultStatus::ErrorAlreadyLoaded, {}}; 213 return {ResultStatus::ErrorAlreadyLoaded, {}};
214 } 214 }
@@ -218,7 +218,7 @@ AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process) {
218 } 218 }
219 219
220 if (romfs != nullptr) { 220 if (romfs != nullptr) {
221 Core::System::GetInstance().GetFileSystemController().RegisterRomFS( 221 system.GetFileSystemController().RegisterRomFS(
222 std::make_unique<FileSys::RomFSFactory>(*this)); 222 std::make_unique<FileSys::RomFSFactory>(*this));
223 } 223 }
224 224