Merge pull request #2406 from Subv/session_disconnect

Kernel: Properly update port counters on session disconnection.

1 files changed, 5 insertions, 8 deletions

diff --git a/src/core/hle/kernel/client_port.cpp b/src/core/hle/kernel/client_port.cpp
index 22645f4ec..ddcf4c916 100644
--- a/src/core/hle/kernel/client_port.cpp
+++ b/src/core/hle/kernel/client_port.cpp
@@ -19,24 +19,21 @@ ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() {
     // AcceptSession before returning from this call.
 
     if (active_sessions >= max_sessions) {
-        // TODO(Subv): Return an error code in this situation after session disconnection is
-        // implemented.
-        /*return ResultCode(ErrorDescription::MaxConnectionsReached,
-                          ErrorModule::OS, ErrorSummary::WouldBlock,
-                          ErrorLevel::Temporary);*/
+        return ResultCode(ErrorDescription::MaxConnectionsReached, ErrorModule::OS,
+                          ErrorSummary::WouldBlock, ErrorLevel::Temporary);
     }
     active_sessions++;
 
     // Create a new session pair, let the created sessions inherit the parent port's HLE handler.
     auto sessions =
-        ServerSession::CreateSessionPair(server_port->GetName(), server_port->hle_handler);
+        ServerSession::CreateSessionPair(server_port->GetName(), server_port->hle_handler, this);
     auto client_session = std::get<SharedPtr<ClientSession>>(sessions);
     auto server_session = std::get<SharedPtr<ServerSession>>(sessions);
 
     if (server_port->hle_handler)
         server_port->hle_handler->ClientConnected(server_session);
-
-    server_port->pending_sessions.push_back(std::move(server_session));
+    else
+        server_port->pending_sessions.push_back(std::move(server_session));
 
     // Wake the threads waiting on the ServerPort
     server_port->WakeupAllWaitingThreads();