зеркало из https://github.com/nextcloud/desktop.git
Fix regression in the PropagateDirectory::slotSubJobsFinished.
Signed-off-by: allexzander <blackslayer4@gmail.com>
This commit is contained in:
Родитель
ffb7fcad7d
Коммит
84cf9c833d
|
@ -1196,11 +1196,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
|
|||
if (!_item->isEmpty() && status == SyncFileItem::Success) {
|
||||
// If a directory is renamed, recursively delete any stale items
|
||||
// that may still exist below the old path.
|
||||
if (_item->_instruction == CSYNC_INSTRUCTION_RENAME
|
||||
&& _item->_originalFile != _item->_renameTarget) {
|
||||
|
||||
if (_item->_instruction == CSYNC_INSTRUCTION_RENAME && _item->_originalFile != _item->_renameTarget) {
|
||||
if (!propagator()->_journal->deleteFileRecord(_item->_originalFile, true)) {
|
||||
qCWarning(lcDirectory) << "could not delete file from local DB" << _item->_originalFile;
|
||||
_state = Finished;
|
||||
status = _item->_status = SyncFileItem::FatalError;
|
||||
_item->_errorString = tr("could not delete file %1 from local DB").arg(_item->_originalFile);
|
||||
qCInfo(lcPropagator) << "PropagateDirectory::slotSubJobsFinished"
|
||||
<< "emit finished" << status;
|
||||
emit finished(status);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче