LuaFAR: fix the last commit

qlost · May 19, 2024 · 8540f60 · 8540f60
1 parent 182f91b
commit 8540f60
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 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, 834 },
+    Version       = { 3, 0, 0, 835 },
     MinFarVersion = { 3, 0, 0, 6327 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",

diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
@@ -1,3 +1,7 @@
+shmuel 2024-05-20 01:24:46+03:00 - build 835
+
+1. LuaFAR: fix the last commit.
+
 shmuel 2024-05-19 17:31:46+03:00 - build 834
 
 1. LuaFAR: refactoring.

diff --git a/plugins/luamacro/luafar/service.c b/plugins/luamacro/luafar/service.c
@@ -1707,12 +1707,12 @@ static int far_Menu(lua_State *L)
 	luaL_checktype(L, POS_ITEMS, LUA_TTABLE);
 	ItemsNumber = lua_objlen(L, POS_ITEMS);
 
-	if (!lua_isnil(L,POS_BKEYS) && !lua_istable(L,POS_BKEYS) && lua_type(L,POS_BKEYS)!=LUA_TSTRING)
-		return luaL_argerror(L, POS_BKEYS, "must be table, string or nil");
-
 	lua_settop(L, POS_BKEYS);     // cut unneeded parameters; make stack predictable
 	lua_newtable(L); // temporary store; at stack position 4
 
+	if (!lua_isnil(L,POS_BKEYS) && !lua_istable(L,POS_BKEYS) && lua_type(L,POS_BKEYS)!=LUA_TSTRING)
+		return luaL_argerror(L, POS_BKEYS, "must be table, string or nil");
+
 	// Properties
 	lua_pushvalue(L, POS_PROPS);
 	X = GetOptIntFromTable(L, "X", -1);

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