mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-25 05:45:42 +03:00
Minor changes.
This commit is contained in:
parent
ef81a8a2ad
commit
1ed8afba09
2 changed files with 6 additions and 3 deletions
|
@ -534,8 +534,11 @@ void CSyncThread::startNextTransfer()
|
|||
_journal->setFileRecord(_directoriesToUpdate.pop());
|
||||
}
|
||||
|
||||
if (!_lastDeleted.isEmpty() && item._file.startsWith(_lastDeleted)
|
||||
&& item._instruction == CSYNC_INSTRUCTION_REMOVE) {
|
||||
if (!_lastDeleted.isEmpty() &&
|
||||
item._file.startsWith(_lastDeleted) ) {
|
||||
if( item._instruction != CSYNC_INSTRUCTION_REMOVE ) {
|
||||
qDebug() << "WRN: Child of a deleted directory has different instruction than delete.";
|
||||
}
|
||||
// If the item's name starts with the name of the previously deleted directory, we
|
||||
// can assume this file was already destroyed by the previous recursive call.
|
||||
_journal->deleteFileRecord(item._file);
|
||||
|
|
|
@ -600,8 +600,8 @@ csync_instructions_e OwncloudPropagator::downloadFile(const SyncFileItem &item,
|
|||
QFile::remove(newName);
|
||||
success = tmpFile.rename(newName);
|
||||
#endif
|
||||
// unixoids
|
||||
if (!success) {
|
||||
|
||||
_errorString = tmpFile.errorString();
|
||||
_status = SyncFileItem::NormalError;
|
||||
return CSYNC_INSTRUCTION_ERROR;
|
||||
|
|
Loading…
Reference in a new issue