diff options
Diffstat (limited to 'commands/compose')
| -rw-r--r-- | commands/compose/postpone.go | 3 | ||||
| -rw-r--r-- | commands/compose/send.go | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/commands/compose/postpone.go b/commands/compose/postpone.go index 9462a9cd..a4ac5c60 100644 --- a/commands/compose/postpone.go +++ b/commands/compose/postpone.go @@ -8,6 +8,7 @@ import ( "github.com/miolini/datacounter" "github.com/pkg/errors" + "git.sr.ht/~rjarry/aerc/logging" "git.sr.ht/~rjarry/aerc/models" "git.sr.ht/~rjarry/aerc/widgets" "git.sr.ht/~rjarry/aerc/worker/types" @@ -66,6 +67,8 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error { // run this as a goroutine so we can make other progress. The message // will be saved once the directory is created. go func() { + defer logging.PanicHandler() + errStr := <-errChan if errStr != "" { aerc.PushError(errStr) diff --git a/commands/compose/send.go b/commands/compose/send.go index dbdb94f9..574e8727 100644 --- a/commands/compose/send.go +++ b/commands/compose/send.go @@ -16,6 +16,7 @@ import ( "github.com/pkg/errors" "git.sr.ht/~rjarry/aerc/lib" + "git.sr.ht/~rjarry/aerc/logging" "git.sr.ht/~rjarry/aerc/models" "git.sr.ht/~rjarry/aerc/widgets" "git.sr.ht/~rjarry/aerc/worker/types" @@ -100,6 +101,8 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error { failCh := make(chan error) //writer go func() { + defer logging.PanicHandler() + var sender io.WriteCloser switch ctx.scheme { case "smtp": @@ -131,6 +134,8 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error { //cleanup + copy to sent go func() { + defer logging.PanicHandler() + err = <-failCh if err != nil { aerc.PushError(strings.ReplaceAll(err.Error(), "\n", " ")) |