From 217e85a55d0c1047bef1e2bc41783ccd4629bfc1 Mon Sep 17 00:00:00 2001 From: Daniel Bridges Date: Tue, 9 Jul 2019 17:04:21 -0700 Subject: Fix crashes when operating on empty folder (#216) --- widgets/msgviewer.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'widgets/msgviewer.go') diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go index f6bef2d..f15fbae 100644 --- a/widgets/msgviewer.go +++ b/widgets/msgviewer.go @@ -2,6 +2,7 @@ package widgets import ( "bufio" + "errors" "fmt" "io" "os/exec" @@ -211,8 +212,11 @@ func (mv *MessageViewer) SelectedAccount() *AccountView { return mv.acct } -func (mv *MessageViewer) SelectedMessage() *models.MessageInfo { - return mv.msg +func (mv *MessageViewer) SelectedMessage() (*models.MessageInfo, error) { + if mv.msg == nil { + return nil, errors.New("no message selected") + } + return mv.msg, nil } func (mv *MessageViewer) ToggleHeaders() { -- cgit v1.2.3