From 7aa91c8d9ceb21e631e52c7ac30e47af2ec5a089 Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Wed, 26 Oct 2022 17:32:14 -0400
Subject: [PATCH] k_server_session: add SendReplyHLE

---
 src/core/hle/kernel/k_server_session.h    | 4 ++++
 src/core/hle/kernel/service_thread.cpp    | 2 +-
 src/core/hle/service/sm/sm_controller.cpp | 5 +----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/core/hle/kernel/k_server_session.h b/src/core/hle/kernel/k_server_session.h
index e4698d3f52..6e189af8b4 100644
--- a/src/core/hle/kernel/k_server_session.h
+++ b/src/core/hle/kernel/k_server_session.h
@@ -55,6 +55,10 @@ public:
     Result ReceiveRequest(std::shared_ptr<HLERequestContext>* out_context = nullptr,
                           std::weak_ptr<SessionRequestManager> manager = {});
 
+    Result SendReplyHLE() {
+        return SendReply(true);
+    }
+
 private:
     /// Frees up waiting client sessions when this server session is about to die
     void CleanupRequests();
diff --git a/src/core/hle/kernel/service_thread.cpp b/src/core/hle/kernel/service_thread.cpp
index 1d87755045..c8fe42537e 100644
--- a/src/core/hle/kernel/service_thread.cpp
+++ b/src/core/hle/kernel/service_thread.cpp
@@ -103,7 +103,7 @@ void ServiceThread::Impl::WaitAndProcessImpl() {
     Result service_rc = manager->CompleteSyncRequest(server_session, *context);
 
     // Reply to the client.
-    rc = server_session->SendReply(true);
+    rc = server_session->SendReplyHLE();
 
     if (rc == ResultSessionClosed || service_rc == IPC::ERR_REMOTE_PROCESS_DEAD) {
         SessionClosed(server_session, manager);
diff --git a/src/core/hle/service/sm/sm_controller.cpp b/src/core/hle/service/sm/sm_controller.cpp
index 940c334785..69e0fe8084 100644
--- a/src/core/hle/service/sm/sm_controller.cpp
+++ b/src/core/hle/service/sm/sm_controller.cpp
@@ -33,16 +33,13 @@ void Controller::CloneCurrentObject(Kernel::HLERequestContext& ctx) {
     // FIXME: this is duplicated from the SVC, it should just call it instead
     // once this is a proper process
 
-    // Declare the session we're going to allocate.
-    Kernel::KSession* session;
-
     // Reserve a new session from the process resource limit.
     Kernel::KScopedResourceReservation session_reservation(&process,
                                                            Kernel::LimitableResource::Sessions);
     ASSERT(session_reservation.Succeeded());
 
     // Create the session.
-    session = Kernel::KSession::Create(system.Kernel());
+    Kernel::KSession* session = Kernel::KSession::Create(system.Kernel());
     ASSERT(session != nullptr);
 
     // Initialize the session.