diff options
| author | 2020-09-16 20:59:44 +0000 | |
|---|---|---|
| committer | 2020-09-16 20:59:44 +0000 | |
| commit | b0ae8265ea0aea16bfe37dce96cc3f758fd35feb (patch) | |
| tree | 735e838e0e271449cecaedc6977c1831c9e39a3a /src/core/loader/nax.cpp | |
| parent | Merge pull request #4658 from lioncash/copy3 (diff) | |
| parent | core/loader: Remove dependencies on the global system instance (diff) | |
| download | yuzu-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/nax.cpp')
| -rw-r--r-- | src/core/loader/nax.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/loader/nax.cpp b/src/core/loader/nax.cpp index a152981a0..49028177b 100644 --- a/src/core/loader/nax.cpp +++ b/src/core/loader/nax.cpp | |||
| @@ -41,7 +41,8 @@ FileType AppLoader_NAX::GetFileType() const { | |||
| 41 | return IdentifyTypeImpl(*nax); | 41 | return IdentifyTypeImpl(*nax); |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | AppLoader_NAX::LoadResult AppLoader_NAX::Load(Kernel::Process& process) { | 44 | AppLoader_NAX::LoadResult AppLoader_NAX::Load(Kernel::Process& process, |
| 45 | [[maybe_unused]] Core::System& system) { | ||
| 45 | if (is_loaded) { | 46 | if (is_loaded) { |
| 46 | return {ResultStatus::ErrorAlreadyLoaded, {}}; | 47 | return {ResultStatus::ErrorAlreadyLoaded, {}}; |
| 47 | } | 48 | } |
| @@ -65,7 +66,7 @@ AppLoader_NAX::LoadResult AppLoader_NAX::Load(Kernel::Process& process) { | |||
| 65 | return {nca_status, {}}; | 66 | return {nca_status, {}}; |
| 66 | } | 67 | } |
| 67 | 68 | ||
| 68 | const auto result = nca_loader->Load(process); | 69 | const auto result = nca_loader->Load(process, system); |
| 69 | if (result.first != ResultStatus::Success) { | 70 | if (result.first != ResultStatus::Success) { |
| 70 | return result; | 71 | return result; |
| 71 | } | 72 | } |