diff -r 8ba2b5007c29 -r e915ed28726e rust/hedgewars-server/src/handlers/common.rs --- a/rust/hedgewars-server/src/handlers/common.rs Wed Mar 27 02:19:44 2024 +0300 +++ b/rust/hedgewars-server/src/handlers/common.rs Wed Mar 27 02:57:44 2024 +0300 @@ -350,9 +350,11 @@ let client = server.client(client_id); let nick = client.nick.clone(); - if let Some(mut room_control) = server.get_room_control(client_id) { - let room_id = room_control.room().id; - let result = room_control.leave_room(); + if let Some((room_id, result)) = server + .get_room_control(client_id) + .into_room() + .map(|mut control| (control.room().id, control.leave_room())) + { get_room_leave_result(server, server.room(room_id), &msg, result, response); }