summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/client_port.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-03-11 15:28:16 +0100
committerLioncash <mathew1800@gmail.com>2019-03-11 15:41:05 +0100
commitaa44eb639bd17b74a67cd614a0c329b4d8d61853 (patch)
tree17aaac37cd8aa703bdb2c3a76c1c276ef9c57aa3 /src/core/hle/kernel/client_port.cpp
parentMerge pull request #2207 from lioncash/hwopus (diff)
downloadyuzu-aa44eb639bd17b74a67cd614a0c329b4d8d61853.tar
yuzu-aa44eb639bd17b74a67cd614a0c329b4d8d61853.tar.gz
yuzu-aa44eb639bd17b74a67cd614a0c329b4d8d61853.tar.bz2
yuzu-aa44eb639bd17b74a67cd614a0c329b4d8d61853.tar.lz
yuzu-aa44eb639bd17b74a67cd614a0c329b4d8d61853.tar.xz
yuzu-aa44eb639bd17b74a67cd614a0c329b4d8d61853.tar.zst
yuzu-aa44eb639bd17b74a67cd614a0c329b4d8d61853.zip
Diffstat (limited to 'src/core/hle/kernel/client_port.cpp')
-rw-r--r--src/core/hle/kernel/client_port.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/kernel/client_port.cpp b/src/core/hle/kernel/client_port.cpp
index d4c91d529..aa432658e 100644
--- a/src/core/hle/kernel/client_port.cpp
+++ b/src/core/hle/kernel/client_port.cpp
@@ -33,10 +33,11 @@ ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() {
// Create a new session pair, let the created sessions inherit the parent port's HLE handler.
auto sessions = ServerSession::CreateSessionPair(kernel, server_port->GetName(), this);
- if (server_port->hle_handler)
- server_port->hle_handler->ClientConnected(std::get<SharedPtr<ServerSession>>(sessions));
- else
- server_port->pending_sessions.push_back(std::get<SharedPtr<ServerSession>>(sessions));
+ if (server_port->HasHLEHandler()) {
+ server_port->GetHLEHandler()->ClientConnected(std::get<SharedPtr<ServerSession>>(sessions));
+ } else {
+ server_port->AppendPendingSession(std::get<SharedPtr<ServerSession>>(sessions));
+ }
// Wake the threads waiting on the ServerPort
server_port->WakeupAllWaitingThreads();