From beee123c801a5dfc757dddb61968aff022da73f8 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 1 Nov 2018 11:02:54 +0100 Subject: [PATCH] New Discovery: Fix trailing slash causing failure on windows --- src/libsync/discovery.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp index 9623cb850..505e6f725 100644 --- a/src/libsync/discovery.cpp +++ b/src/libsync/discovery.cpp @@ -1227,7 +1227,10 @@ DiscoverySingleDirectoryJob *ProcessDirectoryJob::startAsyncServerQuery() bool ProcessDirectoryJob::runLocalQuery() { - auto dh = csync_vio_local_opendir((_discoveryData->_localDir + _currentFolder._local).toUtf8()); + QByteArray localPath = (_discoveryData->_localDir + _currentFolder._local).toUtf8(); + if (localPath.endsWith('/')) // Happens if _currentFolder._local.isEmpty() + localPath.chop(1); + auto dh = csync_vio_local_opendir(localPath); if (!dh) { qCInfo(lcDisco) << "Error while opening directory" << (_discoveryData->_localDir + _currentFolder._local) << errno; QString errorString = tr("Error while opening directory %1").arg(_discoveryData->_localDir + _currentFolder._local);