diff options
| author |  Viktor Szépe | 2024-01-16 00:09:00 +0000 |
|---|---|---|
| committer | Viktor Szépe | 2024-01-16 00:09:00 +0000 |
| commit | 90ab89a0b0174f8df559b79dc06a03479d959f93 (patch) | |
| tree | 3d11a790e44945e309f0e68f5332b33b42e72bbb /src/core/loader/nro.cpp | |
| parent | Fix typos in arrays.xml (diff) | |
| parent | Merge pull request #12681 from t895/stick-toggles (diff) | |
| download | yuzu-90ab89a0b0174f8df559b79dc06a03479d959f93.tar.gz yuzu-90ab89a0b0174f8df559b79dc06a03479d959f93.tar.xz yuzu-90ab89a0b0174f8df559b79dc06a03479d959f93.zip | |
Merge remote-tracking branch 'origin/master' into typos3
Diffstat (limited to 'src/core/loader/nro.cpp')
| -rw-r--r-- | src/core/loader/nro.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index e74697cda..f8225d697 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp | |||
| @@ -275,10 +275,12 @@ AppLoader_NRO::LoadResult AppLoader_NRO::Load(Kernel::KProcess& process, Core::S | |||
| 275 | return {ResultStatus::ErrorLoadingNRO, {}}; | 275 | return {ResultStatus::ErrorLoadingNRO, {}}; |
| 276 | } | 276 | } |
| 277 | 277 | ||
| 278 | if (romfs != nullptr) { | 278 | u64 program_id{}; |
| 279 | system.GetFileSystemController().RegisterRomFS(std::make_unique<FileSys::RomFSFactory>( | 279 | ReadProgramId(program_id); |
| 280 | *this, system.GetContentProvider(), system.GetFileSystemController())); | 280 | system.GetFileSystemController().RegisterProcess( |
| 281 | } | 281 | process.GetProcessId(), program_id, |
| 282 | std::make_unique<FileSys::RomFSFactory>(*this, system.GetContentProvider(), | ||
| 283 | system.GetFileSystemController())); | ||
| 282 | 284 | ||
| 283 | is_loaded = true; | 285 | is_loaded = true; |
| 284 | return {ResultStatus::Success, LoadParameters{Kernel::KThread::DefaultThreadPriority, | 286 | return {ResultStatus::Success, LoadParameters{Kernel::KThread::DefaultThreadPriority, |