[FarGroup/FarManager] master: Correction of 6679 (264828df0)

1 view
Skip to first unread message

farg...@farmanager.com

unread,
Apr 28, 2026, 6:30:54 PM (8 days ago) Apr 28
to farco...@googlegroups.com
Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/264828df0ce1e1fc50db42f282edc5e7d16d157b

>---------------------------------------------------------------

commit 264828df0ce1e1fc50db42f282edc5e7d16d157b
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Tue Apr 28 23:21:04 2026 +0100

Correction of 6679


>---------------------------------------------------------------

264828df0ce1e1fc50db42f282edc5e7d16d157b
far/changelog | 5 +++++
far/copy.cpp | 5 +----
far/vbuild.m4 | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/far/changelog b/far/changelog
index 551306179..d116b1ca7 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2026-04-28 23:20:47+01:00 - build 6680
+
+1. Correction of 6679.
+
--------------------------------------------------------------------------------
drkns 2026-04-28 21:51:48+01:00 - build 6679

diff --git a/far/copy.cpp b/far/copy.cpp
index 1cde2505e..3dbd06364 100644
--- a/far/copy.cpp
+++ b/far/copy.cpp
@@ -3369,10 +3369,7 @@ bool ShellCopy::ShellSystemCopy(const string_view SrcName, const string_view Des
// When we estimate the total size of the operation, we take into account the size of the first stream only (since it's what the OS reports).
// But if the file has alternate streams, the total size can be greater.
// To avoid going over 100%, we need to update the total size accordingly:
- if (
- CallbackReason == CALLBACK_STREAM_SWITCH && StreamNumber == 1 && // it's enough to do it once
- TotalFileSize > StreamSize // and only if needed
- )
+ if (CallbackReason == CALLBACK_STREAM_SWITCH && StreamNumber == 1)
{
CP->add_total_bytes(TotalFileSize - StreamSize);
CP->set_current_total(TotalFileSize);
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index dd989ae4f..32b6f3bf1 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6679
+6680


Reply all
Reply to author
Forward
0 new messages