diff options
Diffstat (limited to 'commands')
-rw-r--r-- | commands/account/next.go | 6 | ||||
-rw-r--r-- | commands/account/view.go | 6 | ||||
-rw-r--r-- | commands/eml.go | 6 | ||||
-rw-r--r-- | commands/msg/delete.go | 6 | ||||
-rw-r--r-- | commands/msg/move.go | 6 | ||||
-rw-r--r-- | commands/reload.go | 6 |
6 files changed, 30 insertions, 6 deletions
diff --git a/commands/account/next.go b/commands/account/next.go index b54ed0c1..92624316 100644 --- a/commands/account/next.go +++ b/commands/account/next.go @@ -77,7 +77,11 @@ func (np NextPrevMsg) Execute(args []string) error { app.PushError(err.Error()) return } - nextMv := app.NewMessageViewer(acct, view) + nextMv, err := app.NewMessageViewer(acct, view) + if err != nil { + app.PushError(err.Error()) + return + } app.ReplaceTab(mv, nextMv, nextMsg.Envelope.Subject, true) }) diff --git a/commands/account/view.go b/commands/account/view.go index 58450044..5f5bd289 100644 --- a/commands/account/view.go +++ b/commands/account/view.go @@ -61,7 +61,11 @@ func (v ViewMessage) Execute(args []string) error { app.PushError(err.Error()) return } - viewer := app.NewMessageViewer(acct, view) + viewer, err := app.NewMessageViewer(acct, view) + if err != nil { + app.PushError(err.Error()) + return + } data := state.NewDataSetter() data.SetAccount(acct.AccountConfig()) data.SetFolder(acct.Directories().SelectedDirectory()) diff --git a/commands/eml.go b/commands/eml.go index a786942c..fa126729 100644 --- a/commands/eml.go +++ b/commands/eml.go @@ -49,7 +49,11 @@ func (e Eml) Execute(args []string) error { app.PushError(err.Error()) return } - msgView := app.NewMessageViewer(acct, view) + msgView, err := app.NewMessageViewer(acct, view) + if err != nil { + app.PushError(err.Error()) + return + } app.NewTab(msgView, view.MessageInfo().Envelope.Subject) }) diff --git a/commands/msg/delete.go b/commands/msg/delete.go index d58b14ad..2e41504a 100644 --- a/commands/msg/delete.go +++ b/commands/msg/delete.go @@ -92,7 +92,11 @@ func (d Delete) Execute(args []string) error { app.PushError(err.Error()) return } - nextMv := app.NewMessageViewer(acct, view) + nextMv, err := app.NewMessageViewer(acct, view) + if err != nil { + app.PushError(err.Error()) + return + } app.ReplaceTab(mv, nextMv, next.Envelope.Subject, true) }) } diff --git a/commands/msg/move.go b/commands/msg/move.go index 1365b060..8e548bfe 100644 --- a/commands/msg/move.go +++ b/commands/msg/move.go @@ -246,7 +246,11 @@ func handleDone( app.PushError(err.Error()) return } - nextMv := app.NewMessageViewer(acct, view) + nextMv, err := app.NewMessageViewer(acct, view) + if err != nil { + app.PushError(err.Error()) + return + } app.ReplaceTab(mv, nextMv, next.Envelope.Subject, true) }) default: diff --git a/commands/reload.go b/commands/reload.go index 2888ef90..ecda1387 100644 --- a/commands/reload.go +++ b/commands/reload.go @@ -126,10 +126,14 @@ func (r Reload) Execute(args []string) error { if !ok { return } - reloaded := app.NewMessageViewer( + reloaded, err := app.NewMessageViewer( mv.SelectedAccount(), mv.MessageView(), ) + if err != nil { + app.PushError(err.Error()) + return + } app.ReplaceTab(mv, reloaded, tab.Name, false) }) |