Skip to content
Permalink
Browse files
Player: Fix a deadlock triggered by previous commit 0e5e497
  • Loading branch information
nerzhul committed Mar 22, 2015
1 parent 0e5e497 commit 0ae75f2a4e3107271924311b93327ff4b6c24e8c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "player.h"

#include <fstream>
#include "jthread/jmutexautolock.h"
#include "util/numeric.h"
#include "hud.h"
#include "constants.h"
@@ -241,6 +242,7 @@ void Player::deSerialize(std::istream &is, std::string playername)
u32 Player::addHud(HudElement *toadd)
{
JMutexAutoLock lock(m_mutex);

u32 id = getFreeHudID();

if (id < hud.size())
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "irrlichttypes_bloated.h"
#include "inventory.h"
#include "constants.h" // BS
#include "jthread/jmutexautolock.h"
#include "jthread/jmutex.h"
#include <list>

#define PLAYERNAME_SIZE 20
@@ -204,7 +204,6 @@ class Player
}

u32 getFreeHudID() {
JMutexAutoLock lock(m_mutex);
size_t size = hud.size();
for (size_t i = 0; i != size; i++) {
if (!hud[i])

0 comments on commit 0ae75f2

Please sign in to comment.