Allow to break directory scan started from a macro (Mantis#0002692).

Fix by Shmuel: shmuz/far2m#36
FarGroup · Jun 17, 2023 · 7050380 · 7050380
1 parent 0b3d91d
commit 7050380
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,9 @@
+--------------------------------------------------------------------------------
+johnd0e 2023-06-17 14:55:00+01:00 - build 6165
+
+1. Allow to break directory scan started from a macro (Mantis#0002692).
+   Fix by Shmuel: https://github.com/shmuz/far2m/issues/36
+
 --------------------------------------------------------------------------------
 drkns 2023-06-14 20:01:09+01:00 - build 6164
 

diff --git a/far/dirinfo.cpp b/far/dirinfo.cpp
@@ -111,10 +111,13 @@ int GetDirInfo(string_view const DirName, DirInfoData& Data, multifilter* Filter
 	// Временные хранилища имён каталогов
 	string strLastDirName;
 	os::fs::find_data FindData;
+
+	// Mantis#0002692
+	Global->CtrlObject->Macro.SuspendMacros(true);
+	SCOPE_EXIT{ Global->CtrlObject->Macro.SuspendMacros(false); };
+
 	while (ScTree.GetNextName(FindData,strFullName))
 	{
-		// Mantis#0002692
-		if (!Global->CtrlObject->Macro.IsExecuting())
 		{
 			INPUT_RECORD rec;
 

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-6164
+6165