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
This commit is contained in:
Olivier Goffart 2018-10-24 10:28:26 +02:00 committed by Kevin Ottens
parent dcfbde2a67
commit e20e1d110f
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2

View file

@ -89,8 +89,7 @@ void PropagateRemoteMove::start()
} }
QString source = propagator()->_remoteFolder + _item->_file; QString source = propagator()->_remoteFolder + _item->_file;
QString destination = QDir::cleanPath(propagator()->account()->url().path() + QLatin1Char('/') QString destination = QDir::cleanPath(propagator()->account()->davUrl().path() + propagator()->_remoteFolder + _item->_renameTarget);
+ propagator()->account()->davPath() + propagator()->_remoteFolder + _item->_renameTarget);
if (_item->_type == ItemTypeVirtualFile || _item->_type == ItemTypeVirtualFileDownload) { if (_item->_type == ItemTypeVirtualFile || _item->_type == ItemTypeVirtualFileDownload) {
auto suffix = propagator()->syncOptions()._virtualFileSuffix; auto suffix = propagator()->syncOptions()._virtualFileSuffix;
ASSERT(source.endsWith(suffix) && destination.endsWith(suffix)); ASSERT(source.endsWith(suffix) && destination.endsWith(suffix));