From 6f08162376ab59d93b91bbc05119074fa2f44fe0 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Tue, 23 Jul 2019 10:51:16 +0200 Subject: [PATCH] lib/model: Remove incorrect/useless panics (#5881) --- lib/model/folder_sendonly.go | 2 +- lib/model/model.go | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/model/folder_sendonly.go b/lib/model/folder_sendonly.go index 5b144951..671c1d95 100644 --- a/lib/model/folder_sendonly.go +++ b/lib/model/folder_sendonly.go @@ -68,7 +68,7 @@ func (f *sendOnlyFolder) pull() bool { curFile, ok := f.fset.Get(protocol.LocalDeviceID, intf.FileName()) if !ok { if intf.IsDeleted() { - panic("Should never get a deleted file as needed when we don't have it") + l.Debugln("Should never get a deleted file as needed when we don't have it") } return true } diff --git a/lib/model/model.go b/lib/model/model.go index 7ebacd84..e5d7da3a 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -248,10 +248,8 @@ func (m *model) StartFolder(folder string) { // Need to hold lock on m.fmut when calling this. func (m *model) startFolderLocked(cfg config.FolderConfiguration) { - if err := m.checkFolderRunningLocked(cfg.ID); err == errFolderMissing { - l.Warnln("Cannot start nonexistent folder", cfg.Description()) - panic("cannot start nonexistent folder") - } else if err == nil { + _, ok := m.folderRunners[cfg.ID] + if ok { l.Warnln("Cannot start already running folder", cfg.Description()) panic("cannot start already running folder") }