octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 19:08:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Schedule pull after revert on recv-enc (#7892)

Browse Source
This commit is contained in:
Simon Frei 2021-08-17 09:24:10 +02:00 committed by GitHub
parent c025e76f30
commit 0fe72e6fc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/model/folder_recvenc.go
View File

@ -94,7 +94,14 @@ func (f *receiveEncryptedFolder) revert() error {
if iterErr != nil { if iterErr != nil {
return iterErr return iterErr
} }
return batch.Flush() if err := batch.Flush(); err != nil {
return err
}
// We might need to pull items if the local changes were on valid, global files.
f.SchedulePull()
return nil
} }
func (f *receiveEncryptedFolder) revertHandleDirs(dirs []string, snap *db.Snapshot) { func (f *receiveEncryptedFolder) revertHandleDirs(dirs []string, snap *db.Snapshot) {