summaryrefslogtreecommitdiff
path: root/src/script/common/c_types.cpp
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2013-11-05 12:06:15 -0500
committerShadowNinja <shadowninja@minetest.net>2013-11-15 14:13:31 -0500
commit371b39a09a0bf248d674fae718f5ff369e895b66 (patch)
treeda8bb27e27a9c89eac895d211721de11a3781533 /src/script/common/c_types.cpp
parent3f519eb72922607329e1e6a48768d84d1f443efc (diff)
downloadminetest-371b39a09a0bf248d674fae718f5ff369e895b66.tar.gz
minetest-371b39a09a0bf248d674fae718f5ff369e895b66.tar.bz2
minetest-371b39a09a0bf248d674fae718f5ff369e895b66.zip
Pass a errfunc to lua_pcall to get a traceback
Diffstat (limited to 'src/script/common/c_types.cpp')
-rw-r--r--src/script/common/c_types.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/script/common/c_types.cpp b/src/script/common/c_types.cpp
index ac724c42c..a6faf9819 100644
--- a/src/script/common/c_types.cpp
+++ b/src/script/common/c_types.cpp
@@ -25,9 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
LuaError::LuaError(lua_State *L, const std::string &s)
{
- m_s = "LuaError: ";
- m_s += s + "\n";
- m_s += script_get_backtrace(L);
+ m_s = "LuaError: " + s;
+ if (L) m_s += '\n' + script_get_backtrace(L);
}
struct EnumString es_ItemType[] =