Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bugfix for lua related crash

Browse Source
This commit is contained in:
Titus Tscharntke 2010-10-12 10:20:00 +00:00
parent 2519588148
commit 15c6ea93b3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/shared_lib/sources/lua/lua_script.cpp
View File

@ -96,13 +96,14 @@ void LuaScript::loadCode(const string &code, const string &name){
void LuaScript::beginCall(const string& functionName) { void LuaScript::beginCall(const string& functionName) {
Lua_STREFLOP_Wrapper streflopWrapper; Lua_STREFLOP_Wrapper streflopWrapper;
currentLuaFunction = functionName; currentLuaFunction = functionName;
SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d] functionName [%s]\n",__FILE__,__FUNCTION__,__LINE__,functionName.c_str()); SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d] functionName [%s]\n",__FILE__,__FUNCTION__,__LINE__,functionName.c_str());
SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] functionName [%s]\n",__FILE__,__FUNCTION__,__LINE__,functionName.c_str()); SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] functionName [%s]\n",__FILE__,__FUNCTION__,__LINE__,functionName.c_str());
lua_getglobal(luaState, functionName.c_str()); lua_getglobal(luaState, functionName.c_str());
currentLuaFunctionIsValid = (lua_isfunction(luaState,lua_gettop(luaState)) == 1); currentLuaFunctionIsValid = lua_isfunction(luaState,lua_gettop(luaState));
argumentCount= 0; argumentCount= 0;
} }
@ -117,6 +118,10 @@ void LuaScript::endCall() {
throw runtime_error("Error calling lua function [" + currentLuaFunction + "] error: " + errorToString(errorCode)); throw runtime_error("Error calling lua function [" + currentLuaFunction + "] error: " + errorToString(errorCode));
} }
} }
else
{
lua_pcall(luaState, argumentCount, 0, 0);
}
} }
void LuaScript::registerFunction(LuaFunction luaFunction, const string &functionName) { void LuaScript::registerFunction(LuaFunction luaFunction, const string &functionName) {