Merge commit from fork

wneessen · web-flow · commit 4641da450f5e · 2025-02-07T09:44:58.000+01:00
Skip nil messages in send loops
diff --git a/client_119.go b/client_119.go
@@ -44,6 +44,9 @@ func (c *Client) SendWithSMTPClient(client *smtp.Client, messages ...*Msg) error
 	}
 	var errs []*SendError
 	for id, message := range messages {
+		if message == nil {
+			continue
+		}
 		if sendErr := c.sendSingleMsg(client, message); sendErr != nil {
 			messages[id].sendError = sendErr
 
diff --git a/client_120.go b/client_120.go
@@ -50,6 +50,9 @@ func (c *Client) SendWithSMTPClient(client *smtp.Client, messages ...*Msg) (retu
 	}()
 
 	for id, message := range messages {
+		if message == nil {
+			continue
+		}
 		if sendErr := c.sendSingleMsg(client, message); sendErr != nil {
 			messages[id].sendError = sendErr
 			errs = append(errs, sendErr)

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,9 @@ func (c Client) SendWithSMTPClient(client smtp.Client, messages ...*Msg) error`
`44`	`44`	`}`
`45`	`45`	`var errs []*SendError`
`46`	`46`	`for id, message := range messages {`
	`47`	`+ if message == nil {`
	`48`	`+ continue`
	`49`	`+ }`
`47`	`50`	`if sendErr := c.sendSingleMsg(client, message); sendErr != nil {`
`48`	`51`	`messages[id].sendError = sendErr`
`49`	`52`