lib: Modify FileInfos consistently (ref #6321) (#6349)

2020-02-19 16:58:09 +01:00
parent 7b5551248a
commit fae7425bbf
6 changed files with 57 additions and 41 deletions
@@ -532,7 +532,8 @@ func (f *folder) scanSubdirs(subDirs []string) error {
 					}
 					return true
 				}
-				nf := file.ConvertToDeletedFileInfo(f.shortID, f.localFlags)
+				nf := file.ConvertToDeletedFileInfo(f.shortID)
+				nf.LocalFlags = f.localFlags
 				if file.ShouldConflict() {
 					// We do not want to override the global version with
 					// the deleted file. Setting to an empty version makes