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

Addressed bug 2995032. LUA now throws a maximum of 8 errors when stopping a script.

This commit is contained in:
ugetab 2010-05-01 16:42:06 +00:00
parent 6c902a9562
commit 0613eb2163
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lua-engine.cpp
View File

@ -111,6 +111,8 @@ extern void WinLuaOnStop(int hDlgAsInt);
static lua_State *L; static lua_State *L;
static int luaexiterrorcount = 8;
// Are we running any code right now? // Are we running any code right now?
static char *luaScriptName = NULL; static char *luaScriptName = NULL;
@ -4591,6 +4593,9 @@ int FCEU_LoadLuaCode(const char *filename, const char *arg) {
//stop any lua we might already have had running //stop any lua we might already have had running
FCEU_LuaStop(); FCEU_LuaStop();
//Reinit the error count
luaexiterrorcount = 8;
if (!L) { if (!L) {
L = lua_open(); L = lua_open();
@ -4734,8 +4739,18 @@ void FCEU_LuaStop() {
//already killed //already killed
if (!L) return; if (!L) return;
//execute the user's shutdown callbacks // Since the script is exiting, we want to prevent an infinite loop.
CallExitFunction(); // CallExitFunction() > HandleCallbackError() > FCEU_LuaStop() > CallExitFunction() ...
if (luaexiterrorcount > 0) {
luaexiterrorcount = luaexiterrorcount - 1;
//execute the user's shutdown callbacks
CallExitFunction();
}
luaexiterrorcount = luaexiterrorcount + 1;
//already killed (after multiple errors)
if (!L) return;
/*info.*/numMemHooks = 0; /*info.*/numMemHooks = 0;
for(int i = 0; i < LUAMEMHOOK_COUNT; i++) for(int i = 0; i < LUAMEMHOOK_COUNT; i++)