copy progress fix

FarGroup · Jul 2, 2017 · 21433b1 · 21433b1
1 parent 837e6c0
commit 21433b1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,7 @@
+drkns 02.07.2017 13:53:50 +0000 - build 4982
+
+1. С форума: Странные значения в диалогах перемещения/копирования
+
 drkns 01.07.2017 13:08:48 +0000 - build 4981
 
 1. Стабы в vc_crt_fix_impl.cpp заменены более-менее рабочими версиями.

diff --git a/far/copy.cpp b/far/copy.cpp
@@ -2254,8 +2254,6 @@ COPY_CODES ShellCopy::ShellCopyOneFile(
 	{
 		for (;;)
 		{
-			unsigned long long SaveTotalSize = CP->m_Bytes.Copied;
-
 			if (!(Flags&FCOPY_COPYTONUL) && Rename)
 			{
 				int AskDelete;
@@ -2506,7 +2504,7 @@ COPY_CODES ShellCopy::ShellCopyOneFile(
 					return COPY_CANCEL;
 				}
 			}
-			CP->m_Bytes.Copied = SaveTotalSize;
+
 			int RetCode = COPY_CANCEL;
 			string strNewName;
 

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