From 0fe72e6fc51df591a5e18629d0a2fd4cadfdfb74 Mon Sep 17 00:00:00 2001
From: Simon Frei <freisim93@gmail.com>
Date: Tue, 17 Aug 2021 09:24:10 +0200
Subject: [PATCH] lib/model: Schedule pull after revert on recv-enc (#7892)

---
 lib/model/folder_recvenc.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/model/folder_recvenc.go b/lib/model/folder_recvenc.go
index e9c8aee35..7e2c5fda6 100644
--- a/lib/model/folder_recvenc.go
+++ b/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) {