浏览代码

Invalid asserting added in cb021fe3

Source commit: d9eaa3694a86b6125845f2eabea53ef6c77fb1a0
Martin Prikryl 3 年之前
父节点
当前提交
78c4c84087
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      source/core/Terminal.cpp

+ 2 - 1
source/core/Terminal.cpp

@@ -4637,7 +4637,8 @@ void __fastcall TTerminal::RenameFile(const TRemoteFile * File, const UnicodeStr
 bool __fastcall TTerminal::DoRenameFile(const UnicodeString FileName, const TRemoteFile * File,
   const UnicodeString NewName, bool Move)
 {
-  bool IsBatchMove = (OperationProgress != NULL) && DebugAlwaysTrue(OperationProgress->Operation == foRemoteMove);
+  // Can be foDelete when recycling (ands overwrite should not happen in this case)
+  bool IsBatchMove = (OperationProgress != NULL) && (OperationProgress->Operation == foRemoteMove);
   TBatchOverwrite BatchOverwrite = (IsBatchMove ? OperationProgress->BatchOverwrite : boNo);
   UnicodeString AbsoluteNewName = AbsolutePath(NewName, true);
   bool Result = true;