From aea6019c0afd70988c76fe7b2df0c1dcae48e5c1 Mon Sep 17 00:00:00 2001 From: Lambda Date: Sun, 23 Jun 2024 18:11:41 +0000 Subject: [PATCH] upgrade_room_route: fix state lock This was using the lock for the replacement room to send events to the original room, which may or may not cause problems. --- src/api/client_server/room.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/api/client_server/room.rs b/src/api/client_server/room.rs index 11c01a67..76ed6b9d 100644 --- a/src/api/client_server/room.rs +++ b/src/api/client_server/room.rs @@ -671,7 +671,6 @@ pub(crate) async fn upgrade_room_route( .await?; // Change lock to replacement room - drop(original_state_lock); let mutex_state = Arc::clone( services() .globals @@ -912,7 +911,7 @@ pub(crate) async fn upgrade_room_route( }, sender_user, &body.room_id, - &replacement_state_lock, + &original_state_lock, ) .await?;