summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2017-01-18 22:44:44 +0100
committerMattes D <github@xoft.cz>2017-01-18 22:44:44 +0100
commitdfb5722fb13969a39249b2bacf57018f4f452b13 (patch)
tree4a17be45c378b6d627b174b8915209fef9563ff4
parentMerge pull request #3548 from cuberite/FixAssertInWebadmin (diff)
downloadcuberite-dfb5722fb13969a39249b2bacf57018f4f452b13.tar
cuberite-dfb5722fb13969a39249b2bacf57018f4f452b13.tar.gz
cuberite-dfb5722fb13969a39249b2bacf57018f4f452b13.tar.bz2
cuberite-dfb5722fb13969a39249b2bacf57018f4f452b13.tar.lz
cuberite-dfb5722fb13969a39249b2bacf57018f4f452b13.tar.xz
cuberite-dfb5722fb13969a39249b2bacf57018f4f452b13.tar.zst
cuberite-dfb5722fb13969a39249b2bacf57018f4f452b13.zip
-rw-r--r--src/WebAdmin.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WebAdmin.cpp b/src/WebAdmin.cpp
index 6906c540f..ee5d536f9 100644
--- a/src/WebAdmin.cpp
+++ b/src/WebAdmin.cpp
@@ -340,8 +340,8 @@ void cWebAdmin::HandleWebadminRequest(cHTTPServerConnection & a_Connection, cHTT
// Try to get the template from the Lua template script
if (ShouldWrapInTemplate)
{
- cCSLock Lock(m_CS);
- cLuaState::cLock lock(m_TemplateScript);
+ cCSLock LockSelf(m_CS);
+ cLuaState::cLock LockTemplate(m_TemplateScript);
if (m_TemplateScript.Call("ShowPage", this, &TemplateRequest, cLuaState::Return, Template))
{
cHTTPOutgoingResponse Resp;