CCF_100
/
suyu-mirror
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 0
Code Issues Releases Wiki Activity

server_session: Fix scenario where all domain handlers are closed.

merge-requests/60/head
bunnei 2018-01-23 22:00:17 +07:00
parent 1b1d399e5f
commit 7588b24f46
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/kernel/server_session.cpp
Unescape Escape View File

@ -89,9 +89,9 @@ ResultCode ServerSession::HandleSyncRequest(SharedPtr<Thread> 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> 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;
}