mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 21:35:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixup previous commit.

Browse source 
We should not overwrite the error
This commit is contained in:
Olivier Goffart 2013-07-15 15:30:40 +02:00 committed by Klaas Freitag
parent db7e8560cf
commit fdd1f885a1
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/csync_util.c
View file

@ -244,7 +244,9 @@ static int _merge_file_trees_visitor(void *obj, void *data) {
CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "file: %s, instruction: UPDATED (%s)", uri, fs->md5);
fs->instruction = CSYNC_INSTRUCTION_NONE;
if (fs->instruction != CSYNC_INSTRUCTION_ERROR) {
fs->instruction = CSYNC_INSTRUCTION_NONE;
}
rc = 0;
out: