octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-09-19 13:19:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2706 from calmh/fix2705

Browse Source 
Don't crash on folder remove while pulling (fixes #2705)
This commit is contained in:
Audrius Butkevicius 2016-01-16 20:54:43 +00:00
commit 42b94561a2
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/model/model.go
View File

@ -1168,6 +1168,10 @@ func (m *Model) updateLocals(folder string, fs []protocol.FileInfo) {
m.fmut.RLock()
files := m.folderFiles[folder]
m.fmut.RUnlock()
if files == nil {
// The folder doesn't exist.
return
}
files.Update(protocol.LocalDeviceID, fs)
filenames := make([]string, len(fs))

7
lib/model/rwfolder.go
View File

@ -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