From: Olivier Goffart Date: Wed, 24 Oct 2018 08:28:26 +0000 (+0200) Subject: Move: Fix too many starting slashes in the destination header X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~452 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e20e1d110f62c3a16509e3bb5004590bc6b602ed;p=nextcloud-desktop.git Move: Fix too many starting slashes in the destination header QDir::cleanPath does not remove starting slashes on windows. So use account::davUrl which is already cleaned Issue: #6824 --- diff --git a/src/libsync/propagateremotemove.cpp b/src/libsync/propagateremotemove.cpp index cb955b608..9da698618 100644 --- a/src/libsync/propagateremotemove.cpp +++ b/src/libsync/propagateremotemove.cpp @@ -89,8 +89,7 @@ void PropagateRemoteMove::start() } QString source = propagator()->_remoteFolder + _item->_file; - QString destination = QDir::cleanPath(propagator()->account()->url().path() + QLatin1Char('/') - + propagator()->account()->davPath() + propagator()->_remoteFolder + _item->_renameTarget); + QString destination = QDir::cleanPath(propagator()->account()->davUrl().path() + propagator()->_remoteFolder + _item->_renameTarget); if (_item->_type == ItemTypeVirtualFile || _item->_type == ItemTypeVirtualFileDownload) { auto suffix = propagator()->syncOptions()._virtualFileSuffix; ASSERT(source.endsWith(suffix) && destination.endsWith(suffix));