fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid duplicate object handle assignment on creation.

Browse Source
This commit is contained in:
Ben Vanik
2015-12-29 14:03:23 -08:00
parent 9c694f07b3
commit 3ca0bff246
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/kernel/util/object_table.cc
View File

@@ -96,8 +96,6 @@ bool ObjectTable::Resize(uint32_t new_capacity) {
}
X_STATUS ObjectTable::AddHandle(XObject* object, X_HANDLE* out_handle) {
assert_not_null(out_handle);
X_STATUS result = X_STATUS_SUCCESS;
uint32_t handle = 0;
@@ -123,7 +121,9 @@ X_STATUS ObjectTable::AddHandle(XObject* object, X_HANDLE* out_handle) {
}
if (XSUCCEEDED(result)) {
*out_handle = handle;
if (out_handle) {
*out_handle = handle;
}
}
return result;

4
src/xenia/kernel/xobject.cc
View File

@@ -42,9 +42,7 @@ XObject::XObject(KernelState* kernel_state, Type type)
// TODO: Assert kernel_state != nullptr in this constructor.
if (kernel_state) {
X_HANDLE handle;
kernel_state->object_table()->AddHandle(this, &handle);
handles_[0] = handle;
kernel_state->object_table()->AddHandle(this, nullptr);
}
}