From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Wed, 1 Feb 2023 18:23:37 +0000 (+0100)
Subject: remove wrong code
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~92^2^2~119^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=033a37e7d1419ffe569c15fa58c122618cceb465;p=nextcloud-desktop.git

remove wrong code

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---

diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
index dfff585f2..2edd3c4c5 100644
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@ -1153,13 +1153,6 @@ void PropagateDownloadFile::downloadFinished()
     ASSERT(!_tmpFile.isOpen());
     const auto filename = propagator()->fullLocalPath(_item->_file);
 
-    // In case of file name clash, report an error
-    // This can happen if another parallel download saved a clashing file.
-    if (propagator()->localFileNameClash(_item->_file)) {
-        done(SyncFileItem::FileNameClash, tr("File %1 cannot be saved because of a local file name clash!").arg(QDir::toNativeSeparators(_item->_file)), ErrorCategory::GenericError);
-        return;
-    }
-
     if (_item->_modtime <= 0) {
         FileSystem::remove(_tmpFile.fileName());
         done(SyncFileItem::NormalError, tr("File %1 has invalid modified time reported by server. Do not save it.").arg(QDir::toNativeSeparators(_item->_file)), ErrorCategory::GenericError);