felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

lib/model: Don't use empty folder cfg for index sender (fixes #7649) (#7671)

Browse Source
This commit is contained in:
Simon Frei
2021-05-15 11:13:39 +02:00
committed by GitHub
parent 1107f6eb5f
commit 0d054f9b64
5 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/model/model.go
+3 -3
View File
@@ -1341,7 +1341,7 @@ func (m *model) ccHandleFolders(folders []protocol.Folder, deviceCfg config.Devi
if err := m.db.AddOrUpdatePendingFolder(folder.ID, of, deviceID); err != nil {
l.Warnf("Failed to persist pending folder entry to database: %v", err)
}
indexSenders.addPending(cfg, ccDeviceInfos[folder.ID])
indexSenders.addPending(folder.ID, ccDeviceInfos[folder.ID])
updatedPending = append(updatedPending, updatedPendingFolder{
FolderID: folder.ID,
FolderLabel: folder.Label,
@@ -1365,7 +1365,7 @@ func (m *model) ccHandleFolders(folders []protocol.Folder, deviceCfg config.Devi
}
if cfg.Paused {
indexSenders.addPending(cfg, ccDeviceInfos[folder.ID])
indexSenders.addPending(folder.ID, ccDeviceInfos[folder.ID])
continue
}
@@ -1410,7 +1410,7 @@ func (m *model) ccHandleFolders(folders []protocol.Folder, deviceCfg config.Devi
// Shouldn't happen because !cfg.Paused, but might happen
// if the folder is about to be unpaused, but not yet.
l.Debugln("ccH: no fset", folder.ID)
indexSenders.addPending(cfg, ccDeviceInfos[folder.ID])
indexSenders.addPending(folder.ID, ccDeviceInfos[folder.ID])
continue
}