New Discovery: Fix trailing slash causing failure on windows

This commit is contained in:
Olivier Goffart 2018-11-01 11:02:54 +01:00 committed by Kevin Ottens
parent 60b17cd128
commit beee123c80
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2

View file

@ -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);