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

Merge commit 'c7330d4543606fc9ea74d8922c0c126f857d9d18' into luafixes2 

Revert bad fix for not terminating script on initial error
This commit is contained in:
TheRealQuantam 2024-01-30 01:45:55 -08:00
parent 640306c797 c7330d4543
commit 821827fbde
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lua-engine.cpp
View File

@ -371,9 +371,6 @@ static void FCEU_LuaOnStop()
#ifdef __WIN_DRIVER__ #ifdef __WIN_DRIVER__
TaseditorDisableManualFunctionIfNeeded(); TaseditorDisableManualFunctionIfNeeded();
#endif #endif
if (info_onstop)
info_onstop(info_uid);
} }
@ -1509,7 +1506,7 @@ static int rom_gethash(lua_State *L) {
{ {
MD5DATA md5hash = GameInfo->MD5; MD5DATA md5hash = GameInfo->MD5;
if (!type) lua_pushstring(L, ""); if (!type) lua_pushstring(L, "");
else if (!stricmp(type, "md5")) lua_pushstring(L, md5_asciistr(md5hash)); else if (!stricmp(type, "md5")) lua_pushstring(L, md5_asciistr(md5hash));
else if (!stricmp(type, "base64")) lua_pushstring(L, BytesToString(md5hash.data, MD5DATA::size).c_str()); else if (!stricmp(type, "base64")) lua_pushstring(L, BytesToString(md5hash.data, MD5DATA::size).c_str());
else lua_pushstring(L, ""); else lua_pushstring(L, "");
@ -6673,6 +6670,9 @@ void FCEU_LuaStop() {
CoInitialize(0); CoInitialize(0);
#endif #endif
if (info_onstop)
info_onstop(info_uid);
//lua_gc(L,LUA_GCCOLLECT,0); //lua_gc(L,LUA_GCCOLLECT,0);