summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/kernel/service_thread.cpp3
-rw-r--r--src/core/memory.cpp2
2 files changed, 0 insertions, 5 deletions
diff --git a/src/core/hle/kernel/service_thread.cpp b/src/core/hle/kernel/service_thread.cpp
index e72c3d35d..38afa720b 100644
--- a/src/core/hle/kernel/service_thread.cpp
+++ b/src/core/hle/kernel/service_thread.cpp
@@ -163,9 +163,6 @@ ServiceThread::Impl::~Impl() {
m_wakeup_event->Signal();
m_host_thread.join();
- // Lock mutex.
- m_session_mutex.lock();
-
// Close all remaining sessions.
for (const auto& [server_session, manager] : m_sessions) {
server_session->Close();
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 3141122f1..b3f50223b 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -195,13 +195,11 @@ struct Memory::Impl {
break;
}
case Common::PageType::Memory: {
- DEBUG_ASSERT(pointer);
u8* mem_ptr = pointer + page_offset + (page_index << YUZU_PAGEBITS);
on_memory(copy_amount, mem_ptr);
break;
}
case Common::PageType::DebugMemory: {
- DEBUG_ASSERT(pointer);
u8* const mem_ptr{GetPointerFromDebugMemory(current_vaddr)};
on_memory(copy_amount, mem_ptr);
break;