From 97bee661b7e92a28c490fa0e005f203b377e782e Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Fri, 19 Jul 2019 17:26:43 -0400
Subject: Fix alternatives config
---
widgets/msgviewer.go | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'widgets')
diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go
index 3f9b7fe..7d92861 100644
--- a/widgets/msgviewer.go
+++ b/widgets/msgviewer.go
@@ -56,7 +56,6 @@ func NewMessageViewer(acct *AccountView, conf *config.AercConfig,
})
switcher := &PartSwitcher{}
- switcher.selected = -1
err := createSwitcher(switcher, conf, store, msg)
if err != nil {
return &MessageViewer{
@@ -164,7 +163,9 @@ func enumerateParts(conf *config.AercConfig, store *lib.MessageStore,
func createSwitcher(switcher *PartSwitcher, conf *config.AercConfig,
store *lib.MessageStore, msg *models.MessageInfo) error {
+
var err error
+ switcher.selected = -1
switcher.showHeaders = conf.Viewer.ShowHeaders
switcher.alwaysShowMime = conf.Viewer.AlwaysShowMime
@@ -185,6 +186,7 @@ func createSwitcher(switcher *PartSwitcher, conf *config.AercConfig,
return err
}
selectedPriority := -1
+ fmt.Printf("Selecting best message from %v\n", conf.Viewer.Alternatives)
for i, pv := range switcher.parts {
pv.OnInvalidate(func(_ ui.Drawable) {
switcher.Invalidate()
@@ -192,7 +194,8 @@ func createSwitcher(switcher *PartSwitcher, conf *config.AercConfig,
// Switch to user's preferred mimetype
if switcher.selected == -1 && pv.part.MIMEType != "multipart" {
switcher.selected = i
- } else if selectedPriority == -1 {
+ }
+ if selectedPriority == -1 {
for idx, m := range conf.Viewer.Alternatives {
if m != pv.part.MIMEType+"/"+pv.part.MIMESubType {
continue
--
cgit 1.4.1-2-gfad0