mirror of
https://github.com/citra-emu/citra.git
synced 2024-11-23 19:50:08 +00:00
Kernel: Don't re-assign object's handle when duplicating one
This commit is contained in:
parent
08096a5015
commit
ff3eee27da
@ -39,7 +39,8 @@ ResultVal<Handle> HandleTable::Create(std::shared_ptr<Object> obj) {
|
||||
if (next_generation >= (1 << 15)) next_generation = 1;
|
||||
|
||||
Handle handle = generation | (slot << 15);
|
||||
obj->handle = handle;
|
||||
if (obj->handle == INVALID_HANDLE)
|
||||
obj->handle = handle;
|
||||
|
||||
generations[slot] = generation;
|
||||
objects[slot] = std::move(obj);
|
||||
|
@ -53,7 +53,7 @@ class HandleTable;
|
||||
|
||||
class Object : NonCopyable, public std::enable_shared_from_this<Object> {
|
||||
friend class HandleTable;
|
||||
u32 handle;
|
||||
u32 handle = INVALID_HANDLE;
|
||||
public:
|
||||
virtual ~Object() {}
|
||||
Handle GetHandle() const { return handle; }
|
||||
|
Loading…
Reference in New Issue
Block a user