lib/model: Don't use ignore patterns for recv-enc folders (fixes #7469) (#7472)

2021-03-16 15:04:11 +01:00
parent e0dd737822
commit 3f2b584c4e
2 changed files with 8 additions and 4 deletions
@@ -331,8 +331,10 @@ func (m *model) StartDeadlockDetector(timeout time.Duration) {
 // Need to hold lock on m.fmut when calling this.
 func (m *model) addAndStartFolderLocked(cfg config.FolderConfiguration, fset *db.FileSet, cacheIgnoredFiles bool) {
 	ignores := ignore.New(cfg.Filesystem(), ignore.WithCache(cacheIgnoredFiles))
-	if err := ignores.Load(".stignore"); err != nil && !fs.IsNotExist(err) {
-		l.Warnln("Loading ignores:", err)
+	if cfg.Type != config.FolderTypeReceiveEncrypted {
+		if err := ignores.Load(".stignore"); err != nil && !fs.IsNotExist(err) {
+			l.Warnln("Loading ignores:", err)
+		}
 	}

 	m.addAndStartFolderLockedWithIgnores(cfg, fset, ignores)