1
0
Эх сурвалжийг харах

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

Simon Frei 6 жил өмнө
parent
commit
e4ab9d3312

+ 1 - 1
lib/model/folder_sendrecv.go

@@ -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