diff options
Diffstat (limited to 'commands/msg')
| -rw-r--r-- | commands/msg/archive.go | 3 | ||||
| -rw-r--r-- | commands/msg/pipe.go | 5 | ||||
| -rw-r--r-- | commands/msg/read.go | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/commands/msg/archive.go b/commands/msg/archive.go index 8f832e58..ebe63ff3 100644 --- a/commands/msg/archive.go +++ b/commands/msg/archive.go @@ -8,6 +8,7 @@ import ( "time" "git.sr.ht/~rjarry/aerc/commands" + "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" @@ -94,6 +95,8 @@ func (Archive) Execute(aerc *widgets.Aerc, args []string) error { } // we need to do that in the background, else we block the main thread go func() { + defer logging.PanicHandler() + wg.Wait() if success { aerc.PushStatus("Messages archived.", 10*time.Second) diff --git a/commands/msg/pipe.go b/commands/msg/pipe.go index 5d8a0424..06f2a4d2 100644 --- a/commands/msg/pipe.go +++ b/commands/msg/pipe.go @@ -9,6 +9,7 @@ import ( "time" "git.sr.ht/~rjarry/aerc/commands" + "git.sr.ht/~rjarry/aerc/logging" "git.sr.ht/~rjarry/aerc/widgets" "git.sr.ht/~rjarry/aerc/worker/types" @@ -89,6 +90,8 @@ func (Pipe) Execute(aerc *widgets.Aerc, args []string) error { return } go func() { + defer logging.PanicHandler() + defer pipe.Close() io.Copy(pipe, reader) }() @@ -146,6 +149,8 @@ func (Pipe) Execute(aerc *widgets.Aerc, args []string) error { }) go func() { + defer logging.PanicHandler() + select { case <-done: break diff --git a/commands/msg/read.go b/commands/msg/read.go index d2484d45..4f8880a8 100644 --- a/commands/msg/read.go +++ b/commands/msg/read.go @@ -8,6 +8,7 @@ import ( "git.sr.ht/~sircmpwn/getopt" "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" @@ -169,6 +170,8 @@ func (FlagMsg) Execute(aerc *widgets.Aerc, args []string) error { // We need to do flagging in the background, else we block the main thread go func() { + defer logging.PanicHandler() + wg.Wait() if success { aerc.PushStatus(actionName+" flag '"+flagName+"' successful", 10*time.Second) |