summaryrefslogtreecommitdiff
path: root/src/clientiface.h
diff options
context:
space:
mode:
authorSmallJoker <SmallJoker@users.noreply.github.com>2019-08-17 13:27:28 +0200
committerGitHub <noreply@github.com>2019-08-17 13:27:28 +0200
commitd73e458db6ab7748fcc7fd485f246971725ea48a (patch)
tree9fb9193c2da45eac245794af8205bcd63d621080 /src/clientiface.h
parent13b22e2afb57eb2da0513f2caca4e88549f55d0a (diff)
downloadminetest-d73e458db6ab7748fcc7fd485f246971725ea48a.tar.gz
minetest-d73e458db6ab7748fcc7fd485f246971725ea48a.tar.bz2
minetest-d73e458db6ab7748fcc7fd485f246971725ea48a.zip
ClientInterface: Use recursive mutex to prevent freeze in on_newplayer() (#8808)
Diffstat (limited to 'src/clientiface.h')
-rw-r--r--src/clientiface.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/clientiface.h b/src/clientiface.h
index 5335fa644..2b0ccfbb1 100644
--- a/src/clientiface.h
+++ b/src/clientiface.h
@@ -501,7 +501,7 @@ private:
// Connection
std::shared_ptr<con::Connection> m_con;
- std::mutex m_clients_mutex;
+ std::recursive_mutex m_clients_mutex;
// Connected clients (behind the con mutex)
RemoteClientMap m_clients;
std::vector<std::string> m_clients_names; //for announcing masterserver