From ded5f8b1a67fbfb3bb0023b9c6d0fc305469ade4 Mon Sep 17 00:00:00 2001
From: sapier <Sapier at GMX dot net>
Date: Wed, 12 Feb 2014 19:47:27 +0100
Subject: [PATCH] Fix possible missing unlock of env_lock

---
 src/server.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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