diff options
| author | Zach Hilman <DarkLordZach@users.noreply.github.com> | 2019-10-06 20:47:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-06 20:47:48 -0400 |
| commit | 5326d3cb3a75a1f7df531e47cf0acadc3c5db32b (patch) | |
| tree | 83697ca2dba90470ba59eff2f56e71769b03e3d9 /src/core/hle/service/ldr/ldr.cpp | |
| parent | dcdd887df3549d41c3fdaf4ad8a20218179039d5 (diff) | |
| parent | 839b38c404224592372647c4adb316bbe6f856e4 (diff) | |
Merge pull request #2951 from lioncash/global
core: Remove Core::CurrentProcess()
Diffstat (limited to 'src/core/hle/service/ldr/ldr.cpp')
| -rw-r--r-- | src/core/hle/service/ldr/ldr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index 3164ca26e..499376bfc 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp @@ -163,7 +163,7 @@ public: return; } - if (Core::CurrentProcess()->GetTitleID() != header.title_id) { + if (system.CurrentProcess()->GetTitleID() != header.title_id) { LOG_ERROR(Service_LDR, "Attempting to load NRR with title ID other than current process. (actual " "{:016X})!", @@ -327,7 +327,7 @@ public: } // Load NRO as new executable module - auto* process = Core::CurrentProcess(); + auto* process = system.CurrentProcess(); auto& vm_manager = process->VMManager(); auto map_address = vm_manager.FindFreeRegion(nro_size + bss_size); @@ -411,7 +411,7 @@ public: return; } - auto& vm_manager = Core::CurrentProcess()->VMManager(); + auto& vm_manager = system.CurrentProcess()->VMManager(); const auto& nro_info = iter->second; // Unmap the mirrored memory |
