diff options
Diffstat (limited to 'src/core/loader/nro.cpp')
| -rw-r--r-- | src/core/loader/nro.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index c557b66dc..0dc06ccea 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include "common/file_util.h" | 8 | #include "common/file_util.h" |
| 9 | #include "common/logging/log.h" | 9 | #include "common/logging/log.h" |
| 10 | #include "common/swap.h" | 10 | #include "common/swap.h" |
| 11 | #include "core/core.h" | ||
| 11 | #include "core/hle/kernel/process.h" | 12 | #include "core/hle/kernel/process.h" |
| 12 | #include "core/hle/kernel/resource_limit.h" | 13 | #include "core/hle/kernel/resource_limit.h" |
| 13 | #include "core/loader/nro.h" | 14 | #include "core/loader/nro.h" |
| @@ -112,7 +113,7 @@ bool AppLoader_NRO::LoadNro(const std::string& path, VAddr load_base) { | |||
| 112 | // Load codeset for current process | 113 | // Load codeset for current process |
| 113 | codeset->name = path; | 114 | codeset->name = path; |
| 114 | codeset->memory = std::make_shared<std::vector<u8>>(std::move(program_image)); | 115 | codeset->memory = std::make_shared<std::vector<u8>>(std::move(program_image)); |
| 115 | Kernel::g_current_process->LoadModule(codeset, load_base); | 116 | Core::CurrentProcess()->LoadModule(codeset, load_base); |
| 116 | 117 | ||
| 117 | return true; | 118 | return true; |
| 118 | } | 119 | } |
| @@ -125,8 +126,6 @@ ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) { | |||
| 125 | return ResultStatus::Error; | 126 | return ResultStatus::Error; |
| 126 | } | 127 | } |
| 127 | 128 | ||
| 128 | process = Kernel::Process::Create("main", 0); | ||
| 129 | |||
| 130 | // Load NRO | 129 | // Load NRO |
| 131 | static constexpr VAddr base_addr{Memory::PROCESS_IMAGE_VADDR}; | 130 | static constexpr VAddr base_addr{Memory::PROCESS_IMAGE_VADDR}; |
| 132 | 131 | ||