vel
/
VelNet-Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

accidentally grabbed a lock twice

main
Kyle Johnsen 2022-02-08 17:13:42 -05:00
parent 38eb7f2c0e
commit 4ce8d48349
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.rs
View File

@ -374,7 +374,7 @@ fn read_join_message(stream: &mut TcpStream, client: &Arc<Client>){
//join room_name //join room_name
{ {
{ {
let rooms = client.rooms_mutex.read().unwrap(); let mut rooms = client.rooms_mutex.write().unwrap();
if !rooms.contains_key(&extended_room_name) { //new room, must create it if !rooms.contains_key(&extended_room_name) { //new room, must create it
let map: HashMap<u32, Arc<Client>> = HashMap::new(); let map: HashMap<u32, Arc<Client>> = HashMap::new();
let r = Arc::new(Room { let r = Arc::new(Room {
@ -382,7 +382,7 @@ fn read_join_message(stream: &mut TcpStream, client: &Arc<Client>){
clients: RwLock::new(map), clients: RwLock::new(map),
master_client: Arc::new(RwLock::new(client.clone())) //client is the master, since they joined first master_client: Arc::new(RwLock::new(client.clone())) //client is the master, since they joined first
}); });
let mut rooms = client.rooms_mutex.write().unwrap();
rooms.insert(String::from(&extended_room_name),r); rooms.insert(String::from(&extended_room_name),r);
println!("New room {} created",&extended_room_name); println!("New room {} created",&extended_room_name);
} }