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

Bug 2087: Hang when entering small directories with FTP protocol

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

Source commit: 263b35c88eab44b87f4dc6aebe01eb8db264e9e3
This commit is contained in:
Martin Prikryl
2022-06-14 13:25:46 +00:00
parent bffa0ebfe0
commit ee08afa721
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/core/FtpFileSystem.cpp
View File

@@ -1474,14 +1474,16 @@ void __fastcall TFTPFileSystem::ResetFileTransfer()
//---------------------------------------------------------------------------
void __fastcall TFTPFileSystem::ReadDirectoryProgress(__int64 Bytes)
{
// with FTP we do not know exactly how many entries we have received,
// instead we know number of bytes received only.
// so we report approximation based on average size of entry.
int Progress = int(Bytes / 80);
DWORD Ticks = GetTickCount();
if (Ticks - FLastReadDirectoryProgress >= 100)
if ((Ticks - FLastReadDirectoryProgress >= 100) &&
// Cannot call OnReadDirectoryProgress with 0 as it would unmatch the "starting" and "ending" signals for disabling the window
(Progress > 0))
{
FLastReadDirectoryProgress = Ticks;
// with FTP we do not know exactly how many entries we have received,
// instead we know number of bytes received only.
// so we report approximation based on average size of entry.
int Progress = int(Bytes / 80);
bool Cancel = false;
FTerminal->DoReadDirectoryProgress(Progress, 0, Cancel);
if (Cancel)