Skip to content

Commit c8a9d9d

Browse files
committed
COperationPerformer Rename option bugfix
1 parent 8a44a04 commit c8a9d9d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

file-commander-core/src/fileoperations/coperationperformer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ COperationPerformer::NextAction COperationPerformer::copyItem(CFileSystemObject&
559559
else if (response == urRename)
560560
{
561561
assert(!_newName.isEmpty());
562-
return naRetryItem;
562+
// Continue - the new name will be accounted for
563563
}
564564
else if (response != urProceedWithThis && response != urProceedWithAll)
565565
{
@@ -613,7 +613,7 @@ COperationPerformer::NextAction COperationPerformer::copyItem(CFileSystemObject&
613613
}
614614

615615
// TODO: add error checking, message displaying etc.!
616-
result = item.copyChunk(chunkSize, destPath, _newName.isEmpty() ? (destInfo.isFile() ? destInfo.fileName() : QString::null) : _newName);
616+
result = item.copyChunk(chunkSize, destPath, _newName.isEmpty() ? (!destFile.isDir() ? destFile.fullName() : QString::null) : _newName);
617617
// Error handling
618618
if (result != rcOk)
619619
break;

0 commit comments

Comments
 (0)