瀏覽代碼

Undoing replacement of *IncludeTrailingBackslash with *CombinePaths in a01665f2

It fails an assertion in UnixCombinePaths

Source commit: 1e18406514b377940de82d2862dde3d339d1e42c
Martin Prikryl 1 月之前
父節點
當前提交
41c7cfe303
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      source/core/Script.cpp

+ 1 - 1
source/core/Script.cpp

@@ -1850,7 +1850,7 @@ UnicodeString __fastcall TScript::SynchronizeFileRecord(
 {
   const TSynchronizeChecklist::TItem::TFileInfo & FileInfo =
     Local ? Item->Local : Item->Remote;
-  UnicodeString Path = UniversalCombinePaths(!Local, FileInfo.Directory, FileInfo.FileName);
+  UnicodeString Path = UniversalIncludeTrailingBackslash(!Local, FileInfo.Directory) + FileInfo.FileName;
 
   if (SameText(RootDirectory, Path.SubString(1, RootDirectory.Length())))
   {