diff options
| author |  Yuri Kunde Schlesner | 2014-12-31 09:20:48 -0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-01-09 19:43:51 -0200 |
| commit | d751de7341029dc8335a6766dcdf5c8dc047f0bc (patch) | |
| tree | 377af7443462b50731ce8a817efbc6803a2b3d3c /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #444 from yuriks/handle-reform2 (diff) | |
| download | yuzu-d751de7341029dc8335a6766dcdf5c8dc047f0bc.tar.gz yuzu-d751de7341029dc8335a6766dcdf5c8dc047f0bc.tar.xz yuzu-d751de7341029dc8335a6766dcdf5c8dc047f0bc.zip | |
Kernel: Don't re-assign object's handle when duplicating one
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index a1bc6c5d8..7d40dcbee 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -44,7 +44,8 @@ ResultVal<Handle> HandleTable::Create(Object* obj) { | |||
| 44 | objects[slot] = obj; | 44 | objects[slot] = obj; |
| 45 | 45 | ||
| 46 | Handle handle = generation | (slot << 15); | 46 | Handle handle = generation | (slot << 15); |
| 47 | obj->handle = handle; | 47 | if (obj->handle == INVALID_HANDLE) |
| 48 | obj->handle = handle; | ||
| 48 | return MakeResult<Handle>(handle); | 49 | return MakeResult<Handle>(handle); |
| 49 | } | 50 | } |
| 50 | 51 | ||