Folder/Watcher: Fix up #5174 #5153 (#5186)

It was surprising to have a broken symlink return empty for
canonical path.
This commit is contained in:
Markus Goetz 2016-09-15 14:56:37 +02:00 committed by GitHub
parent b7809ded23
commit aa5d3055be

View file

@ -123,9 +123,11 @@ Folder::~Folder()
void Folder::checkLocalPath()
{
const QFileInfo fi(_definition.localPath);
_canonicalLocalPath = fi.canonicalFilePath();
if( !_canonicalLocalPath.endsWith('/') ) {
if (_canonicalLocalPath.isEmpty()) {
qDebug() << "Broken symlink:" << _definition.localPath;
_canonicalLocalPath = _definition.localPath;
} else if( !_canonicalLocalPath.endsWith('/') ) {
_canonicalLocalPath.append('/');
}