LuaFAR: a temporary workaround in processing timer events

FarGroup · Jan 22, 2025 · adb7a17 · adb7a17
1 parent 4d9cf65
commit adb7a17
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua
@@ -1,6 +1,6 @@
 function export.GetGlobalInfo()
   return {
-    Version       = { 3, 0, 0, 863 },
+    Version       = { 3, 0, 0, 864 },
     MinFarVersion = { 3, 0, 0, 6380 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",

diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
@@ -1,9 +1,12 @@
+shmuel 2025-01-23 00:39:05+02:00 - build 864
+
+1. LuaFAR: a temporary workaround in processing timer events.
+
 shmuel 2025-01-22 20:36:47+02:00 - build 863
 
 1. LuaFAR plugins: the timer queue is closed in DllMain/DLL_PROCESS_DETACH.
    Was: in ExitFARW.
 
-
 shmuel 2025-01-21 21:18:49+02:00 - build 862
 
 1. Force garbage collection on reloading macrofiles

diff --git a/plugins/luamacro/luafar/exported.c b/plugins/luamacro/luafar/exported.c
@@ -1506,31 +1506,34 @@ intptr_t LF_ProcessSynchroEvent(lua_State* L, const struct ProcessSynchroEventIn
 			case SYNCHRO_TIMER_CALL:
 				if (!sd.timerData->needClose)
 				{
-					lua_rawgeti(L, LUA_REGISTRYINDEX, sd.timerData->tabRef); //+1: Table
+					lua_rawgeti(L, LUA_REGISTRYINDEX, sd.timerData->hndRef); //+1: weak table
+					lua_rawgeti(L, LUA_REGISTRYINDEX, sd.timerData->tabRef); //+2: Table
 
-					if (lua_istable(L, -1))
+					if (lua_istable(L, -2) && lua_istable(L, -1))
 					{
 						int size, index;
 						int tabPos = lua_gettop(L);
-						lua_getfield(L, tabPos, "n"); //+2: table size
+						lua_getfield(L, tabPos, "n"); //+3: table size
 						size = (int)lua_tointeger(L, -1);
-						lua_rawgeti(L, tabPos, 1); // function
-						lua_rawgeti(L, LUA_REGISTRYINDEX, sd.timerData->hndRef); // weak table
-						lua_rawgeti(L, -1, 1); // Lua timer handle
-						lua_remove(L, -2);     // remove the weak table from the stack
+						lua_rawgeti(L, tabPos, 1);   //+4 function
+						lua_rawgeti(L, tabPos-1, 1); //+5 Lua timer handle
 
-						for (index=2; index<=size; index++) // parameters
-							lua_rawgeti(L, tabPos, index);
-
-						if (pcall_msg(L, size, 1) == 0)     //+3
+						if (!lua_isnil(L, -1))   // ### A DIRTY HACK (hopefully temporary)
 						{
-							if (lua_isnumber(L,-1)) ret = lua_tointeger(L,-1);
+							for (index=2; index<=size; index++) // parameters
+								lua_rawgeti(L, tabPos, index);
+
+							if (pcall_msg(L, size, 1) == 0)     //+4
+							{
+								if (lua_isnumber(L,-1)) ret = lua_tointeger(L,-1);
 
-							lua_pop(L,3);
+								lua_pop(L,4);
+							}
+							else lua_pop(L,3);
 						}
-						else lua_pop(L,2);
+						else lua_pop(L, 5); //+0
 					}
-					else lua_pop(L, 1);
+					else lua_pop(L, 2);
 				}
 				break;
 

diff --git a/plugins/luamacro/luafar/version.h b/plugins/luamacro/luafar/version.h
@@ -1,3 +1,3 @@
 #include <farversion.hpp>
 
-#define PLUGIN_BUILD 863
+#define PLUGIN_BUILD 864