From f6d45b747e37ed1871d9155fbf2d3d5099e1c1b8 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sat, 1 May 2021 12:48:41 -0700
Subject: fixup! hle: kernel: Migrate KSession, KClientSession, and
 KServerSession to KAutoObject.

---
 src/core/hle/kernel/k_session.cpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'src/core/hle/kernel/k_session.cpp')

diff --git a/src/core/hle/kernel/k_session.cpp b/src/core/hle/kernel/k_session.cpp
index 5e629d446..7b0bc177d 100644
--- a/src/core/hle/kernel/k_session.cpp
+++ b/src/core/hle/kernel/k_session.cpp
@@ -49,24 +49,30 @@ void KSession::Initialize(KClientPort* port_, const std::string& name_) {
 }
 
 void KSession::Finalize() {
-    if (port != nullptr) {
-        port->OnSessionFinalized();
-        port->Close();
+    if (port == nullptr) {
+        return;
     }
+
+    port->OnSessionFinalized();
+    port->Close();
 }
 
 void KSession::OnServerClosed() {
-    if (GetState() == State::Normal) {
-        SetState(State::ServerClosed);
-        client.OnServerClosed();
+    if (GetState() != State::Normal) {
+        return;
     }
+
+    SetState(State::ServerClosed);
+    client.OnServerClosed();
 }
 
 void KSession::OnClientClosed() {
-    if (GetState() == State::Normal) {
-        SetState(State::ClientClosed);
-        server.OnClientClosed();
+    if (GetState() != State::Normal) {
+        return;
     }
+
+    SetState(State::ClientClosed);
+    server.OnClientClosed();
 }
 
 void KSession::PostDestroy(uintptr_t arg) {
-- 
cgit v1.2.3