Don't crash on folder remove while pulling (fixes #2705)

2016-01-16 21:42:32 +01:00
parent ab9109e0dc
commit acaf134dfe
2 changed files with 11 additions and 0 deletions
--- a/lib/model/rwfolder.go
+++ b/lib/model/rwfolder.go
@@ -527,6 +527,13 @@ func (p *rwFolder) pullerIteration(ignores *ignore.Matcher) int {

 nextFile:
 	for {
+		select {
+		case <-p.stop:
+			// Stop processing files if the puller has been told to stop.
+			break
+		default:
+		}
+
 		fileName, ok := p.queue.Pop()
 		if !ok {
 			break