From 6e0a43b5705f684c16beccfc7d4b9b896017aed4 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Wed, 13 Jan 2021 14:38:13 +0100 Subject: [PATCH] Fix clash detection with virtual files Fixes: #8323 --- src/libsync/propagatedownload.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp index f54e41c68..285446ec1 100644 --- a/src/libsync/propagatedownload.cpp +++ b/src/libsync/propagatedownload.cpp @@ -448,6 +448,11 @@ void PropagateDownloadFile::startAfterIsEncryptedIsChecked() } qCDebug(lcPropagateDownload) << "creating virtual file" << _item->_file; + // do a klaas' case clash check. + if (propagator()->localFileNameClash(_item->_file)) { + done(SyncFileItem::NormalError, tr("File %1 can not be downloaded because of a local file name clash!").arg(QDir::toNativeSeparators(_item->_file))); + return; + } auto r = vfs->createPlaceholder(*_item); if (!r) { done(SyncFileItem::NormalError, r.error()); -- 2.30.2