diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c index d4ae2bb50..9a89361a8 100644 --- a/src/lua_consolelib.c +++ b/src/lua_consolelib.c @@ -321,8 +321,11 @@ static void Lua_OnChange(void) { /// \todo Network this! XD_LUAVAR + // Why?.. + //lua_settop(gL, 0); // Just in case... lua_pushcfunction(gL, LUA_GetErrorMessage); - lua_insert(gL, 1); // Because LUA_Call wants it at index 1. + + int error_handler_i = abs_index(gL, -1); // From CV_OnChange registry field, get the function for this cvar by name. lua_getfield(gL, LUA_REGISTRYINDEX, "CV_OnChange"); @@ -332,9 +335,8 @@ static void Lua_OnChange(void) LUA_RawPushUserdata(gL, this_cvar); - LUA_Call(gL, 1, 0, 1); // call function(cvar) - lua_pop(gL, 1); // pop CV_OnChange table - lua_remove(gL, 1); // remove LUA_GetErrorMessage + LUA_Call(gL, 1, 0, error_handler_i); // call function(cvar) + lua_pop(gL, 2); // pop CV_OnChange table and error handler } static int lib_cvRegisterVar(lua_State *L)