pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/hotfix/v6.4.1' into release/v6.5.0

Browse Source
This commit is contained in:
Elena Subbotina
2021-09-03 17:02:35 +03:00
parent ce43301d5f 8c726e475a
commit 84b3883a1f
50 changed files with 1869 additions and 1410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DesktopEditor/common/Directory.cpp
View File

@ -214,6 +214,8 @@ namespace NSDirectory
{
std::vector<std::wstring> oArray;
if (strDirectory.empty()) return oArray;
#if defined(_WIN32) || defined (_WIN64)
WIN32_FIND_DATAW oFD;
@ -480,6 +482,8 @@ namespace NSDirectory
}
void DeleteDirectory(const std::wstring& strDirectory, bool deleteRoot)
{
if (strDirectory.empty()) return;
std::vector<std::wstring> aFiles = GetFiles(strDirectory);
for(size_t i = 0; i < aFiles.size(); ++i)
{