Received: from NEW-01-2.privateemail.com (new-01-2.privateemail.com [198.54.127.55]) by mail.sr.ht (Postfix) with ESMTPS id 212B940270 for <~sircmpwn/aerc@lists.sr.ht>; Tue, 1 Oct 2019 17:02:27 +0000 (UTC) Received: from MTA-06-1.privateemail.com (unknown [10.20.147.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by NEW-01.privateemail.com (Postfix) with ESMTPS id C514D606ED for <~sircmpwn/aerc@lists.sr.ht>; Tue, 1 Oct 2019 17:02:25 +0000 (UTC) Received: from MTA-06.privateemail.com (localhost [127.0.0.1]) by MTA-06.privateemail.com (Postfix) with ESMTP id B0B926006A; Tue, 1 Oct 2019 13:02:25 -0400 (EDT) Received: from localhost (unknown [10.20.151.203]) by MTA-06.privateemail.com (Postfix) with ESMTPA id 4714160063; Tue, 1 Oct 2019 17:02:25 +0000 (UTC) From: Jeffas To: ~sircmpwn/aerc@lists.sr.ht Cc: Jeffas Subject: [PATCH] Fix selected account to return for messageviewer Date: Tue, 1 Oct 2019 18:01:49 +0100 Message-Id: <20191001170148.40696-1-dev@jeffas.io> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP Content-Transfer-Encoding: quoted-printable This ensures that the selectedaccount is returned if currently selected tab is a messageviewer. This also makes it more extensible for adding other ways of getting the selected account. --- Hopefully fixes https://todo.sr.ht/~sircmpwn/aerc2/255#comment-3921 widgets/aerc.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/widgets/aerc.go b/widgets/aerc.go index 16fe8b7..af51a0f 100644 --- a/widgets/aerc.go +++ b/widgets/aerc.go @@ -269,11 +269,13 @@ func (aerc *Aerc) Logger() *log.Logger { } func (aerc *Aerc) SelectedAccount() *AccountView { - acct, ok :=3D aerc.accounts[aerc.tabs.Tabs[aerc.tabs.Selected].Name] - if !ok { - return nil + switch tab :=3D aerc.SelectedTab().(type) { + case *AccountView: + return tab + case *MessageViewer: + return tab.SelectedAccount() } - return acct + return nil } func (aerc *Aerc) SelectedTab() ui.Drawable { -- 2.23.0