summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLukas Pioch <lukas@zgow.de>2017-01-18 17:29:00 +0100
committerGitHub <noreply@github.com>2017-01-18 17:29:00 +0100
commit7f14faf83146a0d6a7217c2761a00b6360603b90 (patch)
tree82d49b9f94ca922a61ebaf8d92784c40d22d4f8f /src
parentMerge pull request #3544 from cuberite/DeadlockDetectMoreInfo (diff)
parentWebadmin: Added a missing CS lock. (diff)
downloadcuberite-7f14faf83146a0d6a7217c2761a00b6360603b90.tar
cuberite-7f14faf83146a0d6a7217c2761a00b6360603b90.tar.gz
cuberite-7f14faf83146a0d6a7217c2761a00b6360603b90.tar.bz2
cuberite-7f14faf83146a0d6a7217c2761a00b6360603b90.tar.lz
cuberite-7f14faf83146a0d6a7217c2761a00b6360603b90.tar.xz
cuberite-7f14faf83146a0d6a7217c2761a00b6360603b90.tar.zst
cuberite-7f14faf83146a0d6a7217c2761a00b6360603b90.zip
Diffstat (limited to 'src')
-rw-r--r--src/WebAdmin.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/WebAdmin.cpp b/src/WebAdmin.cpp
index 1e60b7c0e..6906c540f 100644
--- a/src/WebAdmin.cpp
+++ b/src/WebAdmin.cpp
@@ -341,6 +341,7 @@ void cWebAdmin::HandleWebadminRequest(cHTTPServerConnection & a_Connection, cHTT
if (ShouldWrapInTemplate)
{
cCSLock Lock(m_CS);
+ cLuaState::cLock lock(m_TemplateScript);
if (m_TemplateScript.Call("ShowPage", this, &TemplateRequest, cLuaState::Return, Template))
{
cHTTPOutgoingResponse Resp;