aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--commands/account/cf.go12
1 files changed, 6 insertions, 6 deletions
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
}