aboutsummaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2019-03-17 14:57:05 -0400
committerDrew DeVault <sir@cmpwn.com>2019-03-17 14:57:05 -0400
commit9e28a02f6a4345ec7b5fdee68864610186f34e91 (patch)
tree866940888523f3cafa649697d088c4e016014662 /commands
parentbd71787e3fa9caf53f18dab37c4f37a2631b2354 (diff)
downloadaerc-9e28a02f6a4345ec7b5fdee68864610186f34e91.tar.gz
commands: handle case where no account selected
Diffstat (limited to 'commands')
-rw-r--r--commands/cf.go3
-rw-r--r--commands/next-folder.go3
-rw-r--r--commands/next-message.go3
-rw-r--r--commands/select-message.go3
4 files changed, 12 insertions, 0 deletions
diff --git a/commands/cf.go b/commands/cf.go
index 83b757ce..d8b0508c 100644
--- a/commands/cf.go
+++ b/commands/cf.go
@@ -20,6 +20,9 @@ func ChangeFolder(aerc *widgets.Aerc, args []string) error {
return errors.New("Usage: cf <folder>")
}
acct := aerc.SelectedAccount()
+ if acct == nil {
+ return errors.New("No account selected")
+ }
previous := acct.Directories().Selected()
if args[1] == "-" {
if dir, ok := history[acct.Name()]; ok {
diff --git a/commands/next-folder.go b/commands/next-folder.go
index dce89075..f0332c6f 100644
--- a/commands/next-folder.go
+++ b/commands/next-folder.go
@@ -32,6 +32,9 @@ func NextPrevFolder(aerc *widgets.Aerc, args []string) error {
}
}
acct := aerc.SelectedAccount()
+ if acct == nil {
+ return errors.New("No account selected")
+ }
for ; n > 0; n-- {
if args[0] == "prev-folder" {
acct.Directories().Prev()
diff --git a/commands/next-message.go b/commands/next-message.go
index 8639973c..d1d188c9 100644
--- a/commands/next-message.go
+++ b/commands/next-message.go
@@ -38,6 +38,9 @@ func NextPrevMessage(aerc *widgets.Aerc, args []string) error {
}
}
acct := aerc.SelectedAccount()
+ if acct == nil {
+ return errors.New("No account selected")
+ }
if pct {
n = int(float64(acct.Messages().Height()) * (float64(n) / 100.0))
}
diff --git a/commands/select-message.go b/commands/select-message.go
index 868d1fd9..728d31ba 100644
--- a/commands/select-message.go
+++ b/commands/select-message.go
@@ -26,6 +26,9 @@ func SelectMessage(aerc *widgets.Aerc, args []string) error {
}
}
acct := aerc.SelectedAccount()
+ if acct == nil {
+ return errors.New("No account selected")
+ }
acct.Messages().Select(n)
return nil
}