From b628460930de369f12226690040e906a329be9ed Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Fri, 21 Aug 2020 10:09:48 +0200 Subject: [PATCH] lib/model: Prevent localflag flipflopping on del. item (ref #6865) (#6919) --- lib/model/folder.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/model/folder.go b/lib/model/folder.go index 7646f5219..af8c49e58 100644 --- a/lib/model/folder.go +++ b/lib/model/folder.go @@ -637,11 +637,11 @@ func (f *folder) scanSubdirs(subDirs []string) error { l.Debugln("marking deleted item that doesn't exist anywhere as not receive-only", file) batchAppend(file.ConvertDeletedToFileInfo(), snap) changes++ - case file.IsDeleted() && file.LocalFlags != f.localFlags: - // No need to bump the version for a file that was - // and is deleted and just the local flags changed. - file.LocalFlags = f.localFlags - l.Debugln("changing localflags on deleted item", file) + case file.IsDeleted() && file.IsReceiveOnlyChanged() && f.Type != config.FolderTypeReceiveOnly: + // No need to bump the version for a file that was and is + // deleted and just the folder type/local flags changed. + file.LocalFlags &^= protocol.FlagLocalReceiveOnly + l.Debugln("removing receive-only flag on deleted item", file) batchAppend(file.ConvertDeletedToFileInfo(), snap) changes++ }