From: sapier <Sapier at GMX dot net>
Date: Wed, 12 Feb 2014 18:47:27 +0000 (+0100)
Subject: Fix possible missing unlock of env_lock
X-Git-Tag: 0.4.10~267
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ded5f8b1a67fbfb3bb0023b9c6d0fc305469ade4;p=oweals%2Fminetest.git

Fix possible missing unlock of env_lock
---

diff --git a/src/server.cpp b/src/server.cpp
index 66f3cc1a7..81622d625 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -4222,9 +4222,10 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason)
 						<<" List of players: "<<os.str()<<std::endl;
 			}
 		}
-		m_env_mutex.Lock();
-		m_clients.DeleteClient(peer_id);
-		m_env_mutex.Unlock();
+		{
+			JMutexAutoLock env_lock(m_env_mutex);
+			m_clients.DeleteClient(peer_id);
+		}
 	}
 
 	// Send leave chat message to all remaining clients