From 19de699ec425856c8522d0c98b49f512dd751e9b Mon Sep 17 00:00:00 2001
From: Alex Alabuzhev <alabuzhev@gmail.com>
Date: Mon, 19 Jan 2015 18:25:30 +0000
Subject: [PATCH] =?UTF-8?q?+1.=20=D0=A3=D1=82=D0=BE=D1=87=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B5?=
 =?UTF-8?q?=D1=81=D1=81=D0=B0=20=D0=BF=D1=80=D0=B8=20=D1=83=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 far/changelog  | 6 +++++-
 far/delete.cpp | 6 +++---
 far/vbuild.m4  | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/far/changelog b/far/changelog
index 08db44ba0e..84cf7ff5f7 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,4 +1,8 @@
-shmuel 18.01.2015 20:58:13 +0200 - build 4245
+drkns 19.01.2015 20:24:15 +0200 - build 4246
+
+1. Уточнение отображения прогресса при удалении файлов.
+
+shmuel 18.01.2015 20:58:13 +0200 - build 4245
 
 1. Данные одноимённых контент-колонок от разных плагинов конкатенируются.
 
diff --git a/far/delete.cpp b/far/delete.cpp
index f86240d8ff..d8dce5ab7e 100644
--- a/far/delete.cpp
+++ b/far/delete.cpp
@@ -237,7 +237,7 @@ static bool WipeFile(const string& Name, int TotalPercent, bool& Cancel, Console
 				BufInit = true;
 			}
 
-			time_check TimeCheck(time_check::delayed, GetRedrawTimeout());
+			time_check TimeCheck(time_check::immediate, GetRedrawTimeout());
 			do
 			{
 				size_t Written;
@@ -572,7 +572,7 @@ ShellDelete::ShellDelete(Panel *SrcPanel,bool Wipe):
 		}
 
 		SrcPanel->GetSelName(nullptr,FileAttr);
-		time_check TimeCheck(time_check::delayed, GetRedrawTimeout());
+		time_check TimeCheck(time_check::immediate, GetRedrawTimeout());
 		bool cannot_recycle_try_delete_folder = false;
 
 		while (!Cancel && (cannot_recycle_try_delete_folder || SrcPanel->GetSelName(&strSelName,FileAttr,&strSelShortName)))
@@ -648,7 +648,7 @@ ShellDelete::ShellDelete(Panel *SrcPanel,bool Wipe):
 					}
 
 					ScTree.SetFindPath(strSelFullName,L"*", 0);
-					time_check TreeTimeCheck(time_check::delayed, GetRedrawTimeout());
+					time_check TreeTimeCheck(time_check::immediate, GetRedrawTimeout());
 
 					while (ScTree.GetNextName(&FindData,strFullName))
 					{
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index 3b3fe00849..a5d633a968 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4245)m4_dnl
+m4_define(BUILD,4246)m4_dnl