diff options
| author | 2018-09-29 15:57:40 -0400 | |
|---|---|---|
| committer | 2018-09-29 16:00:03 -0400 | |
| commit | a63e6f9dfd75f89841817a0185d606da52c7a4a6 (patch) | |
| tree | 5ebf817e2c5ce6736d89e938769be3f73fbb30f4 /src/core/loader/xci.cpp | |
| parent | Merge pull request #1388 from FearlessTobi/port-4258 (diff) | |
| download | yuzu-a63e6f9dfd75f89841817a0185d606da52c7a4a6.tar.gz yuzu-a63e6f9dfd75f89841817a0185d606da52c7a4a6.tar.xz yuzu-a63e6f9dfd75f89841817a0185d606da52c7a4a6.zip | |
loader: Make the Load() function take a process as a regular reference, not a SharedPtr
A process should never require being reference counted in this
situation. If the handle to a process is freed before this function is
called, it's definitely a bug with our lifetime management, so we can
put the requirement in place for the API that the process must be a
valid instance.
Diffstat (limited to 'src/core/loader/xci.cpp')
| -rw-r--r-- | src/core/loader/xci.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp index 16509229f..eda67a8c8 100644 --- a/src/core/loader/xci.cpp +++ b/src/core/loader/xci.cpp | |||
| @@ -9,8 +9,6 @@ | |||
| 9 | #include "core/file_sys/content_archive.h" | 9 | #include "core/file_sys/content_archive.h" |
| 10 | #include "core/file_sys/control_metadata.h" | 10 | #include "core/file_sys/control_metadata.h" |
| 11 | #include "core/file_sys/patch_manager.h" | 11 | #include "core/file_sys/patch_manager.h" |
| 12 | #include "core/file_sys/romfs.h" | ||
| 13 | #include "core/file_sys/submission_package.h" | ||
| 14 | #include "core/hle/kernel/process.h" | 12 | #include "core/hle/kernel/process.h" |
| 15 | #include "core/loader/nca.h" | 13 | #include "core/loader/nca.h" |
| 16 | #include "core/loader/xci.h" | 14 | #include "core/loader/xci.h" |
| @@ -46,7 +44,7 @@ FileType AppLoader_XCI::IdentifyType(const FileSys::VirtualFile& file) { | |||
| 46 | return FileType::Error; | 44 | return FileType::Error; |
| 47 | } | 45 | } |
| 48 | 46 | ||
| 49 | ResultStatus AppLoader_XCI::Load(Kernel::SharedPtr<Kernel::Process>& process) { | 47 | ResultStatus AppLoader_XCI::Load(Kernel::Process& process) { |
| 50 | if (is_loaded) { | 48 | if (is_loaded) { |
| 51 | return ResultStatus::ErrorAlreadyLoaded; | 49 | return ResultStatus::ErrorAlreadyLoaded; |
| 52 | } | 50 | } |