Merge commit 'c7330d4543606fc9ea74d8922c0c126f857d9d18' into luafixes2
Revert bad fix for not terminating script on initial error
This commit is contained in:
commit
821827fbde
|
@ -371,9 +371,6 @@ static void FCEU_LuaOnStop()
|
|||
#ifdef __WIN_DRIVER__
|
||||
TaseditorDisableManualFunctionIfNeeded();
|
||||
#endif
|
||||
|
||||
if (info_onstop)
|
||||
info_onstop(info_uid);
|
||||
}
|
||||
|
||||
|
||||
|
@ -6673,6 +6670,9 @@ void FCEU_LuaStop() {
|
|||
CoInitialize(0);
|
||||
#endif
|
||||
|
||||
if (info_onstop)
|
||||
info_onstop(info_uid);
|
||||
|
||||
//lua_gc(L,LUA_GCCOLLECT,0);
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue