diff --git a/src/xenia/kernel/kernel_state.cc b/src/xenia/kernel/kernel_state.cc index 5d033d0cc..995d53c07 100644 --- a/src/xenia/kernel/kernel_state.cc +++ b/src/xenia/kernel/kernel_state.cc @@ -380,7 +380,7 @@ void KernelState::TerminateTitle(bool from_guest_thread) { for (int i = 0; i < user_modules_.size(); i++) { X_STATUS status = user_modules_[i]->Unload(); assert_true(XSUCCEEDED(status)); - + object_table_.RemoveHandle(user_modules_[i]->handle()); } user_modules_.clear(); @@ -610,7 +610,7 @@ bool KernelState::Save(ByteStream* stream) { auto prev_offset = stream->offset(); stream->Write((uint32_t)object->type()); - if (!object->host_object() && !object->Save(stream)) { + if (!object->is_host_object() && !object->Save(stream)) { // Revert backwards and overwrite if a save failed. stream->set_offset(prev_offset); num_objects--; diff --git a/src/xenia/kernel/util/object_table.cc b/src/xenia/kernel/util/object_table.cc index eb475a2d5..a6199d05b 100644 --- a/src/xenia/kernel/util/object_table.cc +++ b/src/xenia/kernel/util/object_table.cc @@ -226,7 +226,7 @@ void ObjectTable::PurgeAllObjects() { auto lock = global_critical_region_.Acquire(); for (uint32_t slot = 0; slot < table_capacity_; slot++) { auto& entry = table_[slot]; - if (entry.object && !entry.object->host_object()) { + if (entry.object && !entry.object->is_host_object()) { entry.handle_ref_count = 0; entry.object->Release(); diff --git a/src/xenia/kernel/xobject.h b/src/xenia/kernel/xobject.h index cb698dc02..3175ed786 100644 --- a/src/xenia/kernel/xobject.h +++ b/src/xenia/kernel/xobject.h @@ -146,7 +146,7 @@ class XObject { // Has this object been created for use by the host? // Host objects are persisted through reloads/etc. - bool host_object() const { return host_object_; } + bool is_host_object() const { return host_object_; } void set_host_object(bool host_object) { host_object_ = host_object; } template