lib/model: Don't error on pulling deletion of invalid file (fixes syn…

…cthing#5791)
imsodin · Jun 13, 2019 · d28dae7 · d28dae7
1 parent 34c0bc9
commit d28dae7
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/lib/model/folder_sendrecv.go b/lib/model/folder_sendrecv.go
@@ -326,6 +326,14 @@ func (f *sendReceiveFolder) processNeeded(dbUpdateChan chan<- dbUpdateJob, copyC
 			changed++
 
 		case runtime.GOOS == "windows" && fs.WindowsInvalidFilename(file.Name):
+			// Just pretend we deleted it, no reason to create an error
+			// about a deleted file that we can't have anyway.
+			// Reason we need it in the first place is, that it was
+			// ignored at some point.
+			if file.IsDeleted() {
+				dbUpdateChan <- dbUpdateJob{file, dbUpdateDeleteFile}
+				changed++
+			}
 			f.newPullError(file.Name, fs.ErrInvalidFilename)
 
 		case file.IsDeleted():