Browse Source

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

Simon Frei 4 years ago
parent
commit
0fe72e6fc5
1 changed files with 8 additions and 1 deletions
  1. 8 1
      lib/model/folder_recvenc.go

+ 8 - 1
lib/model/folder_recvenc.go

@@ -94,7 +94,14 @@ func (f *receiveEncryptedFolder) revert() error {
 	if iterErr != nil {
 		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) {