From 7588b24f46b52c80018153a37fed214d9856f0f2 Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 23 Jan 2018 22:00:17 -0500 Subject: [PATCH] server_session: Fix scenario where all domain handlers are closed. --- src/core/hle/kernel/server_session.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/hle/kernel/server_session.cpp b/src/core/hle/kernel/server_session.cpp index 7f215d0bb..54481f7f1 100644 --- a/src/core/hle/kernel/server_session.cpp +++ b/src/core/hle/kernel/server_session.cpp @@ -89,9 +89,9 @@ ResultCode ServerSession::HandleSyncRequest(SharedPtr thread) { } LOG_CRITICAL(IPC, "Unknown domain command=%d", domain_message_header->command.Value()); - UNIMPLEMENTED(); + ASSERT(false); } - return domain_request_handlers.front()->HandleSyncRequest(context); + // If there is no domain header, the regular session handler is used } // If this ServerSession has an associated HLE handler, forward the request to it. @@ -117,7 +117,7 @@ ResultCode ServerSession::HandleSyncRequest(SharedPtr thread) { // end of the command such that only commands following this one are handled as domains if (convert_to_domain) { ASSERT_MSG(domain_request_handlers.empty(), "already a domain"); - domain_request_handlers.push_back(std::move(hle_handler)); + domain_request_handlers = {hle_handler}; convert_to_domain = false; }