From c8a2298b9d4a7feb34b31e19c72c3250218286df Mon Sep 17 00:00:00 2001 From: "Dr. Chat" Date: Sat, 5 Dec 2015 18:42:44 -0600 Subject: [PATCH] Remove ~NotifyListener call to UnregisterNotifyListener (as it's impossible for this to occur) --- src/xenia/kernel/kernel_state.cc | 2 +- src/xenia/kernel/notify_listener.cc | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/xenia/kernel/kernel_state.cc b/src/xenia/kernel/kernel_state.cc index 995d53c07..794fb7a3d 100644 --- a/src/xenia/kernel/kernel_state.cc +++ b/src/xenia/kernel/kernel_state.cc @@ -610,7 +610,7 @@ bool KernelState::Save(ByteStream* stream) { auto prev_offset = stream->offset(); stream->Write((uint32_t)object->type()); - if (!object->is_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/notify_listener.cc b/src/xenia/kernel/notify_listener.cc index bf92d8098..55f5cff8c 100644 --- a/src/xenia/kernel/notify_listener.cc +++ b/src/xenia/kernel/notify_listener.cc @@ -17,9 +17,7 @@ namespace kernel { NotifyListener::NotifyListener(KernelState* kernel_state) : XObject(kernel_state, kTypeNotifyListener) {} -NotifyListener::~NotifyListener() { - kernel_state_->UnregisterNotifyListener(this); -} +NotifyListener::~NotifyListener() {} void NotifyListener::Initialize(uint64_t mask) { assert_false(wait_handle_);