diff options
| author | André Colomb <src@andre.colomb.de> | 2022-08-10 08:50:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-10 08:50:19 +0200 |
| commit | 4d4bfe8032a5164384113ab4092015edfc22f0f7 (patch) | |
| tree | 5d0a59934bf700b3e290bd89c06b3b7526d56588 | |
| parent | 28c660e41d1c39c4605e09b05ec59898d4096834 (diff) | |
lib/model: Skip paused folders in aggregated completion loop (fixes #8219) (#8220)
Locally paused folders will fail on checkFolderRunningLocked() and
therefore abort the loop. Avoid this by skipping paused folders
directly.
Co-authored-by: Jakob Borg <jakob@kastelo.net>
| -rw-r--r-- | lib/model/model.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/model/model.go b/lib/model/model.go index 9fdc39d386..0f66cbedd7 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -877,9 +877,14 @@ func (m *model) Completion(device protocol.DeviceID, folder string) (FolderCompl // We want completion for all (shared) folders as an aggregate. var comp FolderCompletion for _, fcfg := range m.cfg.FolderList() { + if fcfg.Paused { + continue + } if device == protocol.LocalDeviceID || fcfg.SharedWith(device) { folderComp, err := m.folderCompletion(device, fcfg.ID) - if err != nil { + if errors.Is(err, ErrFolderPaused) { + continue + } else if err != nil { return FolderCompletion{}, err } comp.add(folderComp) |