From e13c21a032163965de3acb2c796d9ab9276c1206 Mon Sep 17 00:00:00 2001
From: Shmuel Zeigerman <solomuz0@gmail.com>
Date: Sat, 17 Aug 2024 10:29:33 +0300
Subject: [PATCH] LuaFAR: touch #865

Disable calling Lua handler of ProcessConsoleInput while error message is displayed.
---
 plugins/luamacro/_globalinfo.lua   | 2 +-
 plugins/luamacro/changelog         | 6 ++++++
 plugins/luamacro/luafar/exported.c | 3 ++-
 plugins/luamacro/luafar/version.h  | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua
index c41c577922..bf4dc8f03e 100644
--- a/plugins/luamacro/_globalinfo.lua
+++ b/plugins/luamacro/_globalinfo.lua
@@ -1,6 +1,6 @@
 function export.GetGlobalInfo()
   return {
-    Version       = { 3, 0, 0, 846 },
+    Version       = { 3, 0, 0, 847 },
     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
index b1700452a3..94674f782a 100644
--- a/plugins/luamacro/changelog
+++ b/plugins/luamacro/changelog
@@ -1,3 +1,9 @@
+shmuel 2024-08-17 10:06:48+03:00 - build 847
+
+1. LuaFAR:
+     Disable calling Lua handler of ProcessConsoleInput while error message is displayed.
+     See also: Mantis #3035, builds 523 and 605, Github #865.
+
 shmuel 2024-07-13 15:19:38+03:00 - build 846
 
 1. A small fix.
diff --git a/plugins/luamacro/luafar/exported.c b/plugins/luamacro/luafar/exported.c
index 2e2363865d..e7441efbf4 100644
--- a/plugins/luamacro/luafar/exported.c
+++ b/plugins/luamacro/luafar/exported.c
@@ -1707,7 +1707,8 @@ intptr_t LF_ProcessConsoleInput(lua_State* L, struct ProcessConsoleInputInfo *In
 {
 	intptr_t ret = 0;
 
-	if (GetExportFunction(L, "ProcessConsoleInput"))    //+1: Func
+	if (!(GetPluginData(L)->Flags & PDF_PROCESSINGERROR) &&
+			GetExportFunction(L, "ProcessConsoleInput"))    //+1: Func
 	{
 		PushInputRecord(L, &Info->Rec);                  //+2
 		bit64_push(L, Info->Flags);                      //+3
diff --git a/plugins/luamacro/luafar/version.h b/plugins/luamacro/luafar/version.h
index 86a69a7ba5..8bec18f69f 100644
--- a/plugins/luamacro/luafar/version.h
+++ b/plugins/luamacro/luafar/version.h
@@ -1,3 +1,3 @@
 #include <farversion.hpp>
 
-#define PLUGIN_BUILD 846
+#define PLUGIN_BUILD 847