From 4ca2c7297861e54fecbe2a4e7be73da7d76dfaf5 Mon Sep 17 00:00:00 2001 From: lotodore Date: Sun, 2 Sep 2007 22:54:33 +0000 Subject: [PATCH] Fixed problem with recursive mutex. --- src/net/common/clientthread.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp index 076ea7ce..9cd516ff 100644 --- a/src/net/common/clientthread.cpp +++ b/src/net/common/clientthread.cpp @@ -233,7 +233,6 @@ ClientThread::GetGameInfo(unsigned gameId) const PlayerInfo ClientThread::GetPlayerInfo(unsigned playerId) const { - boost::mutex::scoped_lock lock(m_playerInfoMapMutex); PlayerInfo info; if (!GetCachedPlayerInfo(playerId, info)) { @@ -366,8 +365,6 @@ ClientThread::SetPlayerInfo(unsigned id, const PlayerInfo &info) boost::mutex::scoped_lock lock(m_playerInfoMapMutex); m_playerInfoMap[id] = info; } - GetCallback().SignalNetClientPlayerChanged(id, info.playerName); - // Update player data for current game. boost::shared_ptr playerData = GetPlayerDataByUniqueId(id); if (playerData.get()) @@ -375,6 +372,8 @@ ClientThread::SetPlayerInfo(unsigned id, const PlayerInfo &info) playerData->SetName(info.playerName); playerData->SetType(info.ptype); } + + GetCallback().SignalNetClientPlayerChanged(id, info.playerName); } const ClientContext &