perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Pass correct file info to deleteItemOnDisk (fixes #5616) (#5617)

Browse Source
This commit is contained in:
Simon Frei 2019-03-25 12:42:39 +01:00 committed by Jakob Borg
parent 675f289aef
commit e31a116e6e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/model/folder_sendrecv.go
View File

@ -1521,7 +1521,7 @@ func (f *sendReceiveFolder) performFinish(file, curFile protocol.FileInfo, hasCu
return f.moveForConflict(name, file.ModifiedBy.String(), scanChan) return f.moveForConflict(name, file.ModifiedBy.String(), scanChan)
}, f.fs, curFile.Name) }, f.fs, curFile.Name)
} else { } else {
err = f.deleteItemOnDisk(file, scanChan) err = f.deleteItemOnDisk(curFile, scanChan)
} }
if err != nil { if err != nil {
return err return err