Mantis#0002692

FarGroup · Jun 25, 2014 · f7ae5b2 · f7ae5b2
1 parent 105d37a
commit f7ae5b2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,4 +1,9 @@
-w17 25.06.2014 00:16:56 +0400 - build 3962
+svs 25.06.2014 11:17:19 +0400 - build 3963
+
+1. Mantis#0002692: Невозможно прервать операцию, если она запущена из макроса
+   Закомметим и посмотрим.
+
+w17 25.06.2014 00:16:56 +0400 - build 3962
 
 1. Уточнение 3960.
 

diff --git a/far/dirinfo.cpp b/far/dirinfo.cpp
@@ -157,7 +157,8 @@ int GetDirInfo(const wchar_t *Title, const string& DirName, DirInfoData& Data, c
 	}
 	while (ScTree.GetNextName(&FindData,strFullName))
 	{
-		if (!Global->CtrlObject->Macro.IsExecuting())
+		// Mantis#0002692
+		//if (!Global->CtrlObject->Macro.IsExecuting())
 		{
 			INPUT_RECORD rec;
 

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,3962)m4_dnl
+m4_define(BUILD,3963)m4_dnl