Pick up dirs without a CurrentFiler

scanner/walk.go

@@ -176,7 +176,10 @@ func (w *Walker) walkAndHashFiles(res *[]protocol.FileInfo, ign map[string][]str
 						l.Debugln("unchanged:", cf)
 					}
 					*res = append(*res, cf)
-				} else {
+					return nil
+				}
+			}
+
 			var flags uint32 = protocol.FlagDirectory
 			if w.IgnorePerms {
 				flags |= protocol.FlagNoPermBits | 0777
@@ -190,13 +193,11 @@ func (w *Walker) walkAndHashFiles(res *[]protocol.FileInfo, ign map[string][]str
 				Modified: info.ModTime().Unix(),
 			}
 			if debug {
-						l.Debugln("dir:", cf, f)
+				l.Debugln("dir:", f)
 			}
 			*res = append(*res, f)
-				}
 			return nil
 		}
-		}
 
 		if info.Mode().IsRegular() {
 			if w.CurrentFiler != nil {