luamacro:

1. Adaptation to Far 3.0.6342.
FarGroup · Jun 3, 2024 · 44b90a8 · 44b90a8
1 parent ba9067d
commit 44b90a8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 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, 839 },
+    Version       = { 3, 0, 0, 840 },
     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 @@
+zg 2024-06-04 00:07:01+03:00 - build 840
+
+1. Adaptation to Far 3.0.6342.
+
 shmuel 2024-05-30 00:17:44+03:00 - build 839
 
 1. Refactoring.

diff --git a/plugins/luamacro/luafar/service.c b/plugins/luamacro/luafar/service.c
@@ -3985,7 +3985,7 @@ intptr_t LF_DlgProc(lua_State *L, HANDLE hDlg, intptr_t Msg, intptr_t Param1, vo
 	PSInfo *Info = GetPluginData(L)->Info;
 	TDialogData *dd = (TDialogData*) Info->SendDlgMessage(hDlg,DM_GETDLGDATA,0,0);
 
-	if (Msg == DN_INITDIALOG && NonModal(dd))
+	if (Msg == DN_INITDIALOG && dd->hDlg == INVALID_HANDLE_VALUE)
 	{
 		dd->hDlg = hDlg;
 	}
@@ -4053,7 +4053,6 @@ static int far_DialogInit(lua_State *L)
 	// 8-th parameter (flags)
 	Flags = OptFlags(L, 8, 0);
 	dd = NewDialogData(L, pd->Info, INVALID_HANDLE_VALUE, TRUE);
-	dd->isModal = (Flags&FDLG_NONMODAL) == 0;
 	// 9-th parameter (DlgProc function)
 	Proc = NULL;
 	Param = NULL;
@@ -4092,6 +4091,10 @@ static int far_DialogInit(lua_State *L)
 		RemoveDialogFromRegistry(L, dd);
 		lua_pushnil(L);
 	}
+	else
+	{
+		dd->isModal = (Flags&FDLG_NONMODAL) == 0;
+	}
 
 	return 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 839
+#define PLUGIN_BUILD 840