From 0ae75f2a4e3107271924311b93327ff4b6c24e8c Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Sun, 22 Mar 2015 21:33:09 +0100 Subject: Player: Fix a deadlock triggered by previous commit 0e5e49736c0a5fa29bca257bafc02d7c7a7171c9 --- src/player.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/player.cpp') diff --git a/src/player.cpp b/src/player.cpp index 88c5634e3..08cb24248 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "player.h" #include +#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()) -- cgit v1.2.3