XObject no kernel state constructor

2015-12-06 15:34:10 -06:00
parent b3ed0fa445
commit 87931369e4
2 changed files with 11 additions and 4 deletions
--- a/src/xenia/kernel/xobject.cc
+++ b/src/xenia/kernel/xobject.cc
@@ -27,13 +27,19 @@
 namespace xe {
 namespace kernel {

+XObject::XObject(Type type)
+    : kernel_state_(nullptr), pointer_ref_count_(1), type_(type) {
+  handles_.reserve(10);
+}
+
 XObject::XObject(KernelState* kernel_state, Type type)
    : kernel_state_(kernel_state),
      pointer_ref_count_(1),
-      type_(type),
      guest_object_ptr_(0),
      allocated_guest_object_(false) {
-  handles_.reserve(10);
+  XObject::XObject(type);
+
+  // TODO: Assert kernel_state != nullptr in this constructor.
  if (kernel_state) {
    X_HANDLE handle;
    kernel_state->object_table()->AddHandle(this, &handle);