From 86346aa332dd765bc09bd2edeb1c1f40ffab8069 Mon Sep 17 00:00:00 2001 From: Audrius Butkevicius Date: Wed, 15 Oct 2014 15:54:55 +0100 Subject: [PATCH] Add further nil checks (fixes #862, ref #864) --- internal/model/model.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/model/model.go b/internal/model/model.go index e70aefe15..7a09f9c2d 100644 --- a/internal/model/model.go +++ b/internal/model/model.go @@ -438,7 +438,7 @@ func (m *Model) Index(deviceID protocol.DeviceID, folder string, fs []protocol.F for i := 0; i < len(fs); { lamport.Default.Tick(fs[i].Version) - if ignores.Match(fs[i].Name) { + if ignores != nil && ignores.Match(fs[i].Name) { fs[i] = fs[len(fs)-1] fs = fs[:len(fs)-1] } else { @@ -479,7 +479,7 @@ func (m *Model) IndexUpdate(deviceID protocol.DeviceID, folder string, fs []prot for i := 0; i < len(fs); { lamport.Default.Tick(fs[i].Version) - if ignores.Match(fs[i].Name) { + if ignores != nil && ignores.Match(fs[i].Name) { fs[i] = fs[len(fs)-1] fs = fs[:len(fs)-1] } else { @@ -877,7 +877,7 @@ func sendIndexTo(initial bool, minLocalVer uint64, conn protocol.Connection, fol maxLocalVer = f.LocalVersion } - if ignores.Match(f.Name) { + if ignores != nil && ignores.Match(f.Name) { return true } @@ -1077,7 +1077,7 @@ func (m *Model) ScanFolderSub(folder, sub string) error { batch = batch[:0] } - if ignores.Match(f.Name) { + if ignores != nil && ignores.Match(f.Name) { // File has been ignored. Set invalid bit. nf := protocol.FileInfo{ Name: f.Name,