summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2017-01-18 16:30:28 +0100
committerMattes D <github@xoft.cz>2017-01-18 16:30:28 +0100
commit20205d33ba94546ce5b577dfcfacad43e4657164 (patch)
tree82d49b9f94ca922a61ebaf8d92784c40d22d4f8f
parentMerge pull request #3544 from cuberite/DeadlockDetectMoreInfo (diff)
downloadcuberite-20205d33ba94546ce5b577dfcfacad43e4657164.tar
cuberite-20205d33ba94546ce5b577dfcfacad43e4657164.tar.gz
cuberite-20205d33ba94546ce5b577dfcfacad43e4657164.tar.bz2
cuberite-20205d33ba94546ce5b577dfcfacad43e4657164.tar.lz
cuberite-20205d33ba94546ce5b577dfcfacad43e4657164.tar.xz
cuberite-20205d33ba94546ce5b577dfcfacad43e4657164.tar.zst
cuberite-20205d33ba94546ce5b577dfcfacad43e4657164.zip
-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;