N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Kernel: Don't re-assign object's handle when duplicating one

Browse source
This commit is contained in:
Yuri Kunde Schlesner 2014-12-31 09:20:48 -02:00
parent 08096a5015
commit ff3eee27da
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/hle/kernel/kernel.cpp
View file

@ -39,7 +39,8 @@ ResultVal<Handle> HandleTable::Create(std::shared_ptr<Object> obj) {
if (next_generation >= (1 << 15)) next_generation = 1; if (next_generation >= (1 << 15)) next_generation = 1;
Handle handle = generation | (slot << 15); Handle handle = generation | (slot << 15);
obj->handle = handle; if (obj->handle == INVALID_HANDLE)
obj->handle = handle;
generations[slot] = generation; generations[slot] = generation;
objects[slot] = std::move(obj); objects[slot] = std::move(obj);

2
src/core/hle/kernel/kernel.h
View file

@ -53,7 +53,7 @@ class HandleTable;
class Object : NonCopyable, public std::enable_shared_from_this<Object> { class Object : NonCopyable, public std::enable_shared_from_this<Object> {
friend class HandleTable; friend class HandleTable;
u32 handle; u32 handle = INVALID_HANDLE;
public: public:
virtual ~Object() {} virtual ~Object() {}
Handle GetHandle() const { return handle; } Handle GetHandle() const { return handle; }