mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-07-31 21:50:18 +02:00
Code Issues Projects Releases Wiki Activity

Fix crash when a Lua tool Perform callback throws an error

Browse Source 
Broken since 00ec4e0754, when the Perform callback was added. It's a bad idea to pop return values that never got pushed because the function that was supposed to push them threw an error.
This commit is contained in:
Tamás Bálint Misius
2024-11-20 20:42:11 +01:00
parent 0c74c8080d
commit b448622921
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lua/LuaTools.cpp
View File

@@ -91,11 +91,14 @@ static int luaPerformWrapper(SimTool *tool, Simulation *sim, Particle *cpart, in
lsi->Log(CommandInterface::LogError, "In perform func: " + LuaGetError()); lsi->Log(CommandInterface::LogError, "In perform func: " + LuaGetError());
lua_pop(L, 1); lua_pop(L, 1);
} }
if (lua_isboolean(L, -1)) else
{ {
ok = lua_toboolean(L, -1); if (lua_isboolean(L, -1))
{
ok = lua_toboolean(L, -1);
}
lua_pop(L, 1);
} }
lua_pop(L, 1);
} }
return ok; return ok;
} }