citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

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

This commit is contained in:
Yuri Kunde Schlesner 2014-12-31 09:20:48 -02:00
parent 6ae12424df
commit d751de7341
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/hle/kernel/kernel.cpp
View File

@ -44,6 +44,7 @@ ResultVal<Handle> HandleTable::Create(Object* obj) {
objects[slot] = obj; objects[slot] = obj;
Handle handle = generation | (slot << 15); Handle handle = generation | (slot << 15);
if (obj->handle == INVALID_HANDLE)
obj->handle = handle; obj->handle = handle;
return MakeResult<Handle>(handle); return MakeResult<Handle>(handle);
} }

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

@ -52,7 +52,7 @@ class HandleTable;
class Object : NonCopyable { class Object : NonCopyable {
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; }