diff --git a/import.go b/import.go index f6162ef154771aa224fd90cb881906a269a20ea8..e277c60bc5c156088831cb82f7a1f6c52daa59e3 100644 --- a/import.go +++ b/import.go @@ -188,13 +188,6 @@ func (s *Settings[C]) Import() *Settings[C] { s.Lock() - errorCount := len(s.errors) - defer func() { - if len(s.errors) > errorCount { - s.notifyErrorHooks() - } - }() - defaults := s.config var n C @@ -205,6 +198,13 @@ func (s *Settings[C]) Import() *Settings[C] { s.importFiles() s.importStreams() + errorCount := len(s.errors) + defer func() { + if len(s.errors) > errorCount { + s.notifyErrorHooks() + } + }() + if err := mergo.Merge(&s.config, defaults); err != nil { s.errors = append(s.errors, err) }