From a62c1999c520f88513d9b0cf6e3a5c3a548d51ac Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 16 Sep 2020 18:29:24 -0400 Subject: file_sys/romfs_factory: Eliminate usage of the global system accessor --- src/core/loader/deconstructed_rom_directory.cpp | 4 ++-- src/core/loader/nca.cpp | 4 ++-- src/core/loader/nro.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core/loader') diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index 56dda425c..394a1bf26 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp @@ -192,8 +192,8 @@ AppLoader_DeconstructedRomDirectory::LoadResult AppLoader_DeconstructedRomDirect // Register the RomFS if a ".romfs" file was found if (romfs_iter != files.end() && *romfs_iter != nullptr) { romfs = *romfs_iter; - system.GetFileSystemController().RegisterRomFS( - std::make_unique(*this)); + system.GetFileSystemController().RegisterRomFS(std::make_unique( + *this, system.GetContentProvider(), system.GetFileSystemController())); } is_loaded = true; diff --git a/src/core/loader/nca.cpp b/src/core/loader/nca.cpp index 50d7a0f32..fa694de37 100644 --- a/src/core/loader/nca.cpp +++ b/src/core/loader/nca.cpp @@ -58,8 +58,8 @@ AppLoader_NCA::LoadResult AppLoader_NCA::Load(Kernel::Process& process, Core::Sy } if (nca->GetRomFS() != nullptr && nca->GetRomFS()->GetSize() > 0) { - system.GetFileSystemController().RegisterRomFS( - std::make_unique(*this)); + system.GetFileSystemController().RegisterRomFS(std::make_unique( + *this, system.GetContentProvider(), system.GetFileSystemController())); } is_loaded = true; diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 5ce279f81..9fb5eddad 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp @@ -218,8 +218,8 @@ AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process, Core::Sy } if (romfs != nullptr) { - system.GetFileSystemController().RegisterRomFS( - std::make_unique(*this)); + system.GetFileSystemController().RegisterRomFS(std::make_unique( + *this, system.GetContentProvider(), system.GetFileSystemController())); } is_loaded = true; -- cgit v1.2.3