Changeset 6761

Timestamp:

Apr 19, 2010, 4:49:11 PM (14 years ago)

Author:

rgrieder

Message:

Fixed "error in error handler" problem that occurred within CEGUILua scripted events (like clicking on a button).
Initialising values is always a good idea…
Also fixed a potential bug: not removing the error handler from the Lua stack can be very dangerous as I had to find out lately..

Location:

code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua

Files:

• CEGUILua.cpp (modified) (2 diffs)
• CEGUILuaFunctor.cpp (modified) (1 diff)

code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILua.cpp

@@ -56 +56 @@
 *************************************************************************/
 LuaScriptModule::LuaScriptModule() :
-    d_errFuncIndex(LUA_NOREF)
+    d_errFuncIndex(LUA_NOREF),
+    d_activeErrFuncIndex(LUA_NOREF)
 {
     #if LUA_VERSION_NUM >= 501
@@ -105 +106 @@
         Constructor (uses given Lua state)
 *************************************************************************/
-LuaScriptModule::LuaScriptModule(lua_State* state)
+LuaScriptModule::LuaScriptModule(lua_State* state) :
+    d_errFuncIndex(LUA_NOREF),
+    d_activeErrFuncIndex(LUA_NOREF)
 {
         // just use the given state

code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILuaFunctor.cpp

@@ -200 +200 @@
     lua_pop(L, 1);
 
+    // remove error handler from stack
+    if (err_idx != 0)
+        lua_remove(L, err_idx);
+
         if(helper)
         {