mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 23:28:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

Sync engine: Take also in account the fact that the instruction can be IGNORE on both tree

Browse source
This commit is contained in:
Olivier Goffart 2014-08-21 11:33:38 +02:00
parent 1cf956ec21
commit aabcf80774
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mirall/syncengine.cpp
View file

@ -265,7 +265,8 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
item._file = fileUtf8;
item._originalFile = item._file;
if (item._instruction == CSYNC_INSTRUCTION_NONE) {
if (item._instruction == CSYNC_INSTRUCTION_NONE
|| (item._instruction == CSYNC_INSTRUCTION_IGNORE && file->instruction != CSYNC_INSTRUCTION_NONE)) {
item._instruction = file->instruction;
item._modtime = file->modtime;
} else {