From 96cf5c4e63a798ca8e83fcc070cb6e15f2918b0e Mon Sep 17 00:00:00 2001 From: RipleyTom Date: Sat, 31 Jan 2026 03:51:45 +0100 Subject: [PATCH] Fix generic_async_transaction_context thread handling --- rpcs3/Emu/NP/np_contexts.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/NP/np_contexts.cpp b/rpcs3/Emu/NP/np_contexts.cpp index 8bcfd5f01c..46d773d127 100644 --- a/rpcs3/Emu/NP/np_contexts.cpp +++ b/rpcs3/Emu/NP/np_contexts.cpp @@ -17,7 +17,12 @@ generic_async_transaction_context::generic_async_transaction_context(const SceNp generic_async_transaction_context::~generic_async_transaction_context() { if (thread.joinable()) - thread.join(); + { + if (std::this_thread::get_id() == thread.get_id()) + thread.detach(); + else + thread.join(); + } } std::optional generic_async_transaction_context::get_transaction_status()