sysutils/winscp
1
0
Fork 0
mirror of https://github.com/winscp/winscp.git synced 2026-10-28 15:35:08 +03:00
Code Activity

Bug 1807: Failure when change in subfolder is detected while keeping remote directory up to date

Browse Source 
https://winscp.net/tracker/1807

Source commit: 3bd0d9013c4e9f33868e8946c63a00de23b02c00
This commit is contained in:
Martin Prikryl
2019-11-13 12:21:48 +00:00
parent b59dc138d1
commit a39781ee61
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/core/Terminal.cpp
View File

@@ -5802,7 +5802,7 @@ void __fastcall TTerminal::DoSynchronizeCollectFile(const UnicodeString FileName
{
TSynchronizeData * Data = static_cast<TSynchronizeData *>(Param);
if (Data->Options != NULL)
if (DebugAlwaysTrue(Data->Options != NULL))
{
Data->Options->Files++;
}

3
source/windows/SynchronizeController.cpp
View File

@@ -129,10 +129,11 @@ void __fastcall TSynchronizeController::SynchronizeChange(
if (FOnSynchronize != NULL)
{
TSynchronizeOptions DefaultOptions; // Just as a container for the Files field
// this is completelly wrong as the options structure
// can contain non-root specific options in future
TSynchronizeOptions * Options =
((LocalDirectory == RootLocalDirectory) ? FOptions : NULL);
((LocalDirectory == RootLocalDirectory) ? FOptions : &DefaultOptions);
TSynchronizeChecklist * Checklist = NULL;
FOnSynchronize(this, LocalDirectory, RemoteDirectory, FCopyParam,
FSynchronizeParams, &Checklist, Options, false);