diff options
| author | 2019-09-22 11:42:34 +1000 | |
|---|---|---|
| committer | 2019-09-22 11:42:34 +1000 | |
| commit | c9ccdfbeac21ddd74d3cc79e8ef2c8d82f3d4efd (patch) | |
| tree | e260125fd1ef6e8a29b255b967a447eeb1aeb204 /src/core/loader/nro.cpp | |
| parent | Merge pull request #2883 from ogniK5377/log-game (diff) | |
| parent | configure_debug: Move reporting option to logging (diff) | |
| download | yuzu-c9ccdfbeac21ddd74d3cc79e8ef2c8d82f3d4efd.tar.gz yuzu-c9ccdfbeac21ddd74d3cc79e8ef2c8d82f3d4efd.tar.xz yuzu-c9ccdfbeac21ddd74d3cc79e8ef2c8d82f3d4efd.zip | |
Merge pull request #2430 from DarkLordZach/fs-controller
core: Implement FileSystemController to deglobalize FS services
Diffstat (limited to 'src/core/loader/nro.cpp')
| -rw-r--r-- | src/core/loader/nro.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 3a5361fdd..175898b91 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include "common/file_util.h" | 10 | #include "common/file_util.h" |
| 11 | #include "common/logging/log.h" | 11 | #include "common/logging/log.h" |
| 12 | #include "common/swap.h" | 12 | #include "common/swap.h" |
| 13 | #include "core/core.h" | ||
| 13 | #include "core/file_sys/control_metadata.h" | 14 | #include "core/file_sys/control_metadata.h" |
| 14 | #include "core/file_sys/romfs_factory.h" | 15 | #include "core/file_sys/romfs_factory.h" |
| 15 | #include "core/file_sys/vfs_offset.h" | 16 | #include "core/file_sys/vfs_offset.h" |
| @@ -214,7 +215,8 @@ AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::Process& process) { | |||
| 214 | } | 215 | } |
| 215 | 216 | ||
| 216 | if (romfs != nullptr) { | 217 | if (romfs != nullptr) { |
| 217 | Service::FileSystem::RegisterRomFS(std::make_unique<FileSys::RomFSFactory>(*this)); | 218 | Core::System::GetInstance().GetFileSystemController().RegisterRomFS( |
| 219 | std::make_unique<FileSys::RomFSFactory>(*this)); | ||
| 218 | } | 220 | } |
| 219 | 221 | ||
| 220 | is_loaded = true; | 222 | is_loaded = true; |