From 3424c36d5225f6b798616dc691ea10bb693a2dcc Mon Sep 17 00:00:00 2001 From: Reto Brunner Date: Wed, 31 Jul 2019 09:50:08 +0200 Subject: ChangeFolder: do not depend on the msgstore We need to clear the filtering etc upon folder switch. Not having a valid msgstore is however no reason not to switch directories. --- commands/account/cf.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'commands/account') diff --git a/commands/account/cf.go b/commands/account/cf.go index 2ebc294..f078984 100644 --- a/commands/account/cf.go +++ b/commands/account/cf.go @@ -34,22 +34,22 @@ func (_ ChangeFolder) Execute(aerc *widgets.Aerc, args []string) error { if acct == nil { return errors.New("No account selected") } - store := acct.Store() - if store == nil { - return errors.New("Cannot perform action. Messages still loading") - } previous := acct.Directories().Selected() if args[1] == "-" { if dir, ok := history[acct.Name()]; ok { - store.ApplyClear() acct.Directories().Select(dir) } else { return errors.New("No previous folder to return to") } } else { - store.ApplyClear() acct.Directories().Select(args[1]) } history[acct.Name()] = previous + + // reset store filtering if we switched folders + store := acct.Store() + if store != nil { + store.ApplyClear() + } return nil } -- cgit v1.2.3