chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-05-08 11:34:08 +02:00
Code

Fixed typo preventing successful path rename on Win and modified ASSERT for Window path styles

Browse Source 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit f993e7c555)
Signed-off-by: Michael Schuster <michael@schuster.ms>
This commit is contained in:
Dominique Fuchs 2019-10-08 08:31:31 +02:00 committed by Michael Schuster
parent d4b9b5129a
commit ed7c489722
No known key found for this signature in database
GPG Key ID: 00819E3BF4177B28
2 changed files with 5 additions and 1 deletions

4
src/csync/csync_exclude.cpp
View File

@ -288,7 +288,11 @@ void ExcludedFiles::addManualExclude(const QByteArray &expr)
void ExcludedFiles::addManualExclude(const QByteArray &expr, const QByteArray &basePath)
{
#if defined(_WIN32)
Q_ASSERT(basePath.size() >= 2 && basePath.at(1) == ':');
#elif
Q_ASSERT(basePath.startsWith('/'));
#endif
Q_ASSERT(basePath.endsWith('/'));
auto key = basePath;

2
test/testfolderwatcher.cpp
View File

@ -146,7 +146,7 @@ private slots:
mkdir(_rootPath + "/a0/b");
mkdir(_rootPath + "/a0/b/c");
touch(file);
mv(_rootPath + "/a0 ", _rootPath + "/a");
mv(_rootPath + "/a0", _rootPath + "/a");
QVERIFY(waitForPathChanged(_rootPath + "/a/b/c/empty.txt"));
}