Changeset 6670 for code/branches/gamestates2/src/libraries

Timestamp:

Apr 1, 2010, 1:46:53 PM (14 years ago)

Author:

rgrieder

Message:

Lua errors in 'doFile', 'includeFile' or 'require' should not be caught in theses functions but rather at the beginning of the Lua call.

File:

• code/branches/gamestates2/src/libraries/core/LuaState.cc (modified) (3 diffs)

code/branches/gamestates2/src/libraries/core/LuaState.cc

@@ -201 +201 @@
         case LUA_ERRMEM:    // Memory allocation error
             COUT(1) << "Lua memory allocation error: Consult your dentist immediately!" << std::endl;
-            lua_pop(luaState_, 1); // Remove error message
             break;
         }
@@ -213 +212 @@
             {
             case LUA_ERRRUN: // Runtime error
-                // Remove error string from stack (we already display the error in the
+                // Do nothing (we already display the error in the
                 // 'errorHandler' Lua function in LuaStateInit.lua)
                 break;
@@ -223 +222 @@
                 break;
             }
-            if (error != 0)
-                lua_pop(luaState_, 1); // Remove error message
         }
 
         if (error != 0)
+        {
+            lua_pop(luaState_, 1);  // Remove error message
             lua_pushnil(luaState_); // Push a nil return value
+        }
 
         if (errorHandler != 0)