diff --git a/lib/model/folder.go b/lib/model/folder.go index f310fc0d9..92045d4d6 100644 --- a/lib/model/folder.go +++ b/lib/model/folder.go @@ -296,8 +296,10 @@ func (f *folder) getHealthErrorAndLoadIgnores() error { if err := f.getHealthErrorWithoutIgnores(); err != nil { return err } - if err := f.ignores.Load(".stignore"); err != nil && !fs.IsNotExist(err) { - return errors.Wrap(err, "loading ignores") + if f.Type != config.FolderTypeReceiveEncrypted { + if err := f.ignores.Load(".stignore"); err != nil && !fs.IsNotExist(err) { + return errors.Wrap(err, "loading ignores") + } } return nil } diff --git a/lib/model/model.go b/lib/model/model.go index b8fe36b2e..dbb7425f9 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -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)