summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2024-01-15 13:50:43 -0500
committerGitHub <noreply@github.com>2024-01-15 13:50:43 -0500
commitdb3a6075f58fd3b4d3de9f2a472c29b57d6e1321 (patch)
treeff03cd23c0bec177c4770d0511024ff84bc5b451
parent817c7c445dcad03756e484810445d1d3ebc2bde2 (diff)
parent200b371d13bb5919ce68d72c760b86313bec3b0f (diff)
Merge pull request #12610 from liamwhite/reply-and-dont-receive
server_manager: respond to session close correctly
-rw-r--r--src/core/hle/service/server_manager.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/hle/service/server_manager.cpp b/src/core/hle/service/server_manager.cpp
index 15edb23e0..8ef49387d 100644
--- a/src/core/hle/service/server_manager.cpp
+++ b/src/core/hle/service/server_manager.cpp
@@ -256,8 +256,13 @@ Result ServerManager::WaitAndProcessImpl() {
// Wait for a signal.
s32 out_index{-1};
- R_TRY(Kernel::KSynchronizationObject::Wait(m_system.Kernel(), &out_index, wait_objs.data(),
- num_objs, -1));
+ R_TRY_CATCH(Kernel::KSynchronizationObject::Wait(m_system.Kernel(), &out_index,
+ wait_objs.data(), num_objs, -1)) {
+ R_CATCH(Kernel::ResultSessionClosed) {
+ // On session closed, index is updated and we don't want to return an error.
+ }
+ }
+ R_END_TRY_CATCH;
ASSERT(out_index >= 0 && out_index < num_objs);
// Set the output index.