From 7a227917ff3e9fc15cc49164d8801774f10593e1 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 9 Mar 2022 11:13:51 -0600 Subject: [PATCH] fix: rpc-server shutdown assertion failure (#2747) Fixes #2742. --- libtransmission/rpc-server.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libtransmission/rpc-server.cc b/libtransmission/rpc-server.cc index 2f10dff59..6d46163b3 100644 --- a/libtransmission/rpc-server.cc +++ b/libtransmission/rpc-server.cc @@ -790,7 +790,7 @@ static void startServer(tr_rpc_server* server) static void stopServer(tr_rpc_server* server) { - TR_ASSERT(tr_amInEventThread(server->session)); + auto const lock = server->session->unique_lock(); rpc_server_start_retry_cancel(server); @@ -1234,7 +1234,5 @@ tr_rpc_server::tr_rpc_server(tr_session* session_in, tr_variant* settings) tr_rpc_server::~tr_rpc_server() { - TR_ASSERT(tr_amInEventThread(this->session)); - stopServer(this); }