aboutsummaryrefslogtreecommitdiffstats
path: root/commands/compose
diff options
context:
space:
mode:
Diffstat (limited to 'commands/compose')
-rw-r--r--commands/compose/postpone.go8
-rw-r--r--commands/compose/send.go8
2 files changed, 12 insertions, 4 deletions
diff --git a/commands/compose/postpone.go b/commands/compose/postpone.go
index e1c0568b..4b1e4419 100644
--- a/commands/compose/postpone.go
+++ b/commands/compose/postpone.go
@@ -35,9 +35,13 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
if acct == nil {
return errors.New("No account selected")
}
- composer, _ := aerc.SelectedTabContent().(*widgets.Composer)
+ tab := aerc.SelectedTab()
+ if tab == nil {
+ return errors.New("No tab selected")
+ }
+ composer, _ := tab.Content.(*widgets.Composer)
config := composer.Config()
- tabName := aerc.TabNames()[aerc.SelectedTabIndex()]
+ tabName := tab.Name
if config.Postpone == "" {
return errors.New("No Postpone location configured")
diff --git a/commands/compose/send.go b/commands/compose/send.go
index 776779e6..cca1540f 100644
--- a/commands/compose/send.go
+++ b/commands/compose/send.go
@@ -43,8 +43,12 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error {
if len(args) > 1 {
return errors.New("Usage: send")
}
- composer, _ := aerc.SelectedTabContent().(*widgets.Composer)
- tabName := aerc.TabNames()[aerc.SelectedTabIndex()]
+ tab := aerc.SelectedTab()
+ if tab == nil {
+ return errors.New("No selected tab")
+ }
+ composer, _ := tab.Content.(*widgets.Composer)
+ tabName := tab.Name
config := composer.Config()
if config.Outgoing == "" {