Jakob Borg ebd2e5bf30 lib/model: Correctly handle manual rescan with ignore error (fixes #5985) (#5987) ...

Assume a folder error was set due to bad ignores on the latest scan.
Previously, doing a manual rescan would result in:

1. Clearing the folder error, which schedules (immediately) an fs
   watcher restart

2. Attempting to load the ignores, which fails, so we set a folder
   error and bail.

3. Now the fs watcher restarts, as scheduled, so we trigger a scan.
   Goto 1.

This change fixes this by not clearing the error until the error is
actually cleared, that is, if both the health check and ignore loading
succeeds.

2019-08-30 13:27:26 +01:00

23 KiB

Raw Blame History

View Raw