pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Network] replaced isExit flag

Browse Source
This commit is contained in:
Maxim Kadushkin
2022-01-24 17:59:55 +03:00
parent d997dae36c
commit 536b080451
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Common/Network/FileTransporter/src/FileTransporter_win.cpp
View File

@ -376,7 +376,7 @@ namespace NSNetwork
}
DownloadProgress progress;
progress.bIsExit = m_bIsExit;
progress.func_getAborted = std::bind(&CFileTransporterBaseWin::getAborted, this);
progress.func_onProgress = m_func_onProgress;
// Скачиваем файл с возвратом процентов состояния
return URLDownloadToFileW (NULL, sFileURL.c_str(), strFileOutput.c_str(), NULL, static_cast<IBindStatusCallback*>(&progress));
@ -417,7 +417,7 @@ namespace NSNetwork
virtual HRESULT __stdcall OnProgress(ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText)
{
if(bIsExit && bIsExit->load())
if(func_getAborted && func_getAborted())
{
return E_ABORT;
}
@ -430,10 +430,14 @@ namespace NSNetwork
return S_OK;
}
std::atomic<bool>* bIsExit = nullptr;
std::function<bool(void)> func_getAborted = nullptr;
std::function<void(int)> func_onProgress = nullptr;
};
bool getAborted() const {
return m_bIsExit && m_bIsExit->load();
}
bool DownloadFilePS(const std::wstring& sFileURL, const std::wstring& strFileOutput)
{
STARTUPINFO sturtupinfo;