diff options
| author | Mat M <mathew1800@gmail.com> | 2018-12-12 16:24:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-12 16:24:23 -0500 |
| commit | 700075beb6fb68ec40ddf622a6b634377a5286c5 (patch) | |
| tree | 4197e8decd64b3974add609d6bc9983030c3ad96 /src/core/hle/kernel/shared_memory.h | |
| parent | 9bae3ac33a10b33031375b3238027f8f1bd15d22 (diff) | |
| parent | ae390ad5a2571cec79d4a7a7b175ac4738e6c748 (diff) | |
Merge pull request #1890 from jschmer/master
Fix Process object leak on emulation stop
Diffstat (limited to 'src/core/hle/kernel/shared_memory.h')
| -rw-r--r-- | src/core/hle/kernel/shared_memory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h index 0b48db699..dab2a6bea 100644 --- a/src/core/hle/kernel/shared_memory.h +++ b/src/core/hle/kernel/shared_memory.h @@ -45,8 +45,8 @@ public: * linear heap. * @param name Optional object name, used for debugging purposes. */ - static SharedPtr<SharedMemory> Create(KernelCore& kernel, SharedPtr<Process> owner_process, - u64 size, MemoryPermission permissions, + static SharedPtr<SharedMemory> Create(KernelCore& kernel, Process* owner_process, u64 size, + MemoryPermission permissions, MemoryPermission other_permissions, VAddr address = 0, MemoryRegion region = MemoryRegion::BASE, std::string name = "Unknown"); @@ -139,7 +139,7 @@ private: /// Permission restrictions applied to other processes mapping the block. MemoryPermission other_permissions{}; /// Process that created this shared memory block. - SharedPtr<Process> owner_process; + Process* owner_process; /// Address of shared memory block in the owner process if specified. VAddr base_address = 0; /// Name of shared memory object. |
