Уточнение revision 13496.

FarGroup · Oct 31, 2015 · dc7b441 · dc7b441
1 parent ba8c663
commit dc7b441
Show file tree

Hide file tree

Showing 4 changed files with 9 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       = { 1, 0, 0, 540 },
+    Version       = { 1, 0, 0, 541 },
     MinFarVersion = { 3, 0, 0, 4450 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",

diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
@@ -1,4 +1,8 @@
-shmuel 31.10.2015 19:33:22 +0200 - build 540
+shmuel 31.10.2015 22:34:42 +0200 - build 541
+
+1. Уточнение 540.
+
+shmuel 31.10.2015 19:33:22 +0200 - build 540
 
 1. Добавлен новый вид события: group="MacrosLoaded". Обработчики вызываются по завершению загрузки макрофайлов.
 

diff --git a/plugins/luamacro/luamacro.rc b/plugins/luamacro/luamacro.rc
@@ -1,6 +1,6 @@
 #include <farversion.hpp>
 
-#define PLUGIN_BUILD 540
+#define PLUGIN_BUILD 541
 #define PLUGIN_DESC "Lua Macros for Far Manager"
 #define PLUGIN_NAME "LuaMacro"
 #define PLUGIN_FILENAME "luamacro.dll"

diff --git a/plugins/luamacro/utils.lua b/plugins/luamacro/utils.lua
@@ -766,7 +766,8 @@ local function LoadMacros (unload, paths)
     export.ProcessViewerEvent = Events.viewerevent[1] and export_ProcessViewerEvent
     export.ProcessConsoleInput = Events.consoleinput[1] and export_ProcessConsoleInput
 
-    EV_Handler(Events.macrosloaded)
+    local ok, msg = pcall(EV_Handler, Events.macrosloaded)
+    if not ok then ErrMsg(msg) end
     LoadMacrosDone = true
   end