mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 15:06:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

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>
This commit is contained in:
Dominique Fuchs 2019-10-08 08:31:31 +02:00
parent 9c199cc753
commit f993e7c555
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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) 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('/')); Q_ASSERT(basePath.startsWith('/'));
#endif
Q_ASSERT(basePath.endsWith('/')); Q_ASSERT(basePath.endsWith('/'));
auto key = basePath; auto key = basePath;

2
test/testfolderwatcher.cpp
View file

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