ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Scripting: Fix require return values

This commit is contained in:
Vicki Pfau 2022-06-10 19:55:45 -07:00
parent 9ac6096c3d
commit 601d025e30
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/script/engines/lua.c
View File

@ -981,6 +981,7 @@ static int _luaLenList(lua_State* lua) {
static int _luaRequireShim(lua_State* lua) { static int _luaRequireShim(lua_State* lua) {
struct mScriptEngineContextLua* luaContext = _luaGetContext(lua); struct mScriptEngineContextLua* luaContext = _luaGetContext(lua);
int oldtop = lua_gettop(luaContext->lua);
const char* path = lua_tostring(lua, lua_upvalueindex(1)); const char* path = lua_tostring(lua, lua_upvalueindex(1));
lua_getglobal(luaContext->lua, "package"); lua_getglobal(luaContext->lua, "package");
@ -1018,7 +1019,7 @@ static int _luaRequireShim(lua_State* lua) {
lua_rawgeti(luaContext->lua, LUA_REGISTRYINDEX, luaContext->require); lua_rawgeti(luaContext->lua, LUA_REGISTRYINDEX, luaContext->require);
lua_rotate(luaContext->lua, -2, 1); lua_rotate(luaContext->lua, -2, 1);
int ret = lua_pcall(luaContext->lua, 1, 0, 0); int ret = lua_pcall(luaContext->lua, 1, LUA_MULTRET, 0);
lua_getglobal(luaContext->lua, "package"); lua_getglobal(luaContext->lua, "package");
@ -1038,5 +1039,6 @@ static int _luaRequireShim(lua_State* lua) {
lua_error(luaContext->lua); lua_error(luaContext->lua);
} }
return 1; int newtop = lua_gettop(luaContext->lua);
return newtop - oldtop + 1;
} }