From 22c222bf75d6f1e1887e8c4ad2702d697e600141 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@kastelo.net>
Date: Sat, 16 May 2020 23:05:33 +0200
Subject: [PATCH] lib/model: Partial revert of rename fix (fixes #6653) (#6656)

We can't just drop the snap because it's in use elsewhere. This should
be equally functional.
---
 lib/model/folder.go | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/model/folder.go b/lib/model/folder.go
index 8db1dfb58..b0e9d1fe2 100644
--- a/lib/model/folder.go
+++ b/lib/model/folder.go
@@ -460,13 +460,8 @@ func (f *folder) scanSubdirs(subDirs []string) error {
 			continue
 		}
 
-		if batch.full() {
-			if err := batch.flush(); err != nil {
-				return err
-			}
-			snap.Release()
-			snap = f.fset.Snapshot()
-			alreadyUsed = make(map[string]struct{})
+		if err := batch.flushIfFull(); err != nil {
+			return err
 		}
 
 		batch.append(res.File)