Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* After calling the Lua event handler function make sure to pop the return value from the stack 

* If the Lua event handler function didn't return a value, assume it was successful (and leave the stack as is)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5978 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-09-09 11:04:56 +00:00
parent 75d615d134
commit 0d3b868de7
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/betawidget/betawidget.i
View File

@ -25,6 +25,9 @@ typedef struct
static bool callbackHandler(widget* const self, const event* const evt, int const handlerId, lua_widget_callback const * const callbackRef)
{
const int stack_top = lua_gettop(callbackRef->L);
bool result;
assert(self == callbackRef->self);
assert(evt->type == callbackRef->type);
assert(handlerId == callbackRef->handlerId);
@ -50,7 +53,14 @@ static bool callbackHandler(widget* const self, const event* const evt, int cons
// return callback(self, evt, handlerId)
if (lua_pcall(callbackRef->L, 3, 1, 0) != 0)
return false;
return lua_toboolean(callbackRef->L, 1);
if (lua_gettop(callbackRef->L) != (stack_top + 1))
// If no value got returned assume the event handler was succesfull
return true;
// Pop the result from the stack and return it
result = lua_toboolean(callbackRef->L, -1);
lua_pop(callbackRef->L, 1);
return result;
}
static bool callbackDestructor(widget* const self, const event* const evt, int const handlerId, lua_widget_callback* const callbackRef)