From a778b410b9516aee2cd6cc3a67a49b4102abacd7 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Wed, 15 Oct 2014 10:51:09 +0200 Subject: [PATCH] Only do initial scan if scanInterval==0 (fixes #856) --- internal/model/puller.go | 4 +++- internal/model/scanner.go | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/model/puller.go b/internal/model/puller.go index 8676e16e..2e1548ca 100644 --- a/internal/model/puller.go +++ b/internal/model/puller.go @@ -190,7 +190,9 @@ loop: break loop } p.model.setState(p.folder, FolderIdle) - scanTimer.Reset(p.scanIntv) + if p.scanIntv > 0 { + scanTimer.Reset(p.scanIntv) + } if !initialScanCompleted { l.Infoln("Completed initial scan (rw) of folder", p.folder) initialScanCompleted = true diff --git a/internal/model/scanner.go b/internal/model/scanner.go index b736fb4c..97281aa5 100644 --- a/internal/model/scanner.go +++ b/internal/model/scanner.go @@ -59,6 +59,10 @@ func (s *Scanner) Serve() { initialScanCompleted = true } + if s.intv == 0 { + return + } + timer.Reset(s.intv) } }