[FarGroup/FarManager] master: Correction of 6588 (91a333972)

0 views
Skip to first unread message

farg...@farmanager.com

unread,
Nov 10, 2025, 1:31:03 PM (6 days ago) Nov 10
to farco...@googlegroups.com
Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/91a33397276240e2a5f0143f0bbccc2bda86ff93

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

commit 91a33397276240e2a5f0143f0bbccc2bda86ff93
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Mon Nov 10 18:15:20 2025 +0000

Correction of 6588


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

91a33397276240e2a5f0143f0bbccc2bda86ff93
far/copy.cpp | 9 +++++++++
1 file changed, 9 insertions(+)

diff --git a/far/copy.cpp b/far/copy.cpp
index aac289f2c..b70e19fb8 100644
--- a/far/copy.cpp
+++ b/far/copy.cpp
@@ -1610,7 +1610,10 @@ void ShellCopy::copy_selected_items(const string_view Dest, std::optional<error_
continue;

case COPY_SKIPPED_DIRECTORY:
+ // The directory was not created because it already exists in the destination, so no need to increment the counter.
CP->skip(0);
+ // However, for all intent and purposes, the operation was successful.
+ CopyCode = COPY_SUCCESS;
break;

case COPY_FILTERED:
@@ -1658,7 +1661,10 @@ void ShellCopy::copy_selected_items(const string_view Dest, std::optional<error_
continue;

case COPY_SKIPPED_DIRECTORY:
+ // The directory was not created because it already exists in the destination, so no need to increment the counter.
CP->skip(0);
+ // However, for all intent and purposes, the operation was successful.
+ CopyCode = COPY_SUCCESS;
break;
}
}
@@ -1789,7 +1795,10 @@ void ShellCopy::copy_selected_items(const string_view Dest, std::optional<error_
break;

case COPY_SKIPPED_DIRECTORY:
+ // The directory was not created because it already exists in the destination, so no need to increment the counter.
CP->skip(0);
+ // However, for all intent and purposes, the operation was successful.
+ CopyCode = COPY_SUCCESS;
break;
}
}


Reply all
Reply to author
Forward
0 new messages