diff options
| author | Tim Culverhouse <tim@timculverhouse.com> | 2022-07-26 08:13:21 -0500 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2022-07-26 22:24:01 +0200 |
| commit | 6db766260b7c23ec113e31010e0ac68105622956 (patch) | |
| tree | 8aad8e5b50278c9c2f7e90f607bda3f7da06cc97 | |
| parent | 26b9c3d9665db0d5a7990f75fc1baccc0139e7a5 (diff) | |
| download | aerc-6db766260b7c23ec113e31010e0ac68105622956.zip | |
sort: clear sort criteria when called without arguments
Fix a regression introduced by commit c2f4404fca15 ("threading: enable
filtering of server-side threads"). Prior to this commit, a :sort
command (no args) would clear out the current sort criteria (or rather,
apply the value from the config). Restore this functionality.
Fixes: c2f4404fca15 ("threading: enable filtering of server-side threads")
Reported-by: akspecs <akspecs@gmail.com>
Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Acked-by: Robin Jarry <robin@jarry.cc>
| -rw-r--r-- | commands/account/search.go | 2 | ||||
| -rw-r--r-- | lib/msgstore.go | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/commands/account/search.go b/commands/account/search.go index 290aafc..8209924 100644 --- a/commands/account/search.go +++ b/commands/account/search.go @@ -46,7 +46,7 @@ func (SearchFilter) Execute(aerc *widgets.Aerc, args []string) error { logging.Infof("Filter results: %v", store.Uids()) } } - store.Sort(nil, cb) + store.Sort(store.GetCurrentSortCriteria(), cb) } else { acct.SetStatus(statusline.Search("Searching...")) cb := func(uids []uint32) { diff --git a/lib/msgstore.go b/lib/msgstore.go index c9f8fd9..d9140d7 100644 --- a/lib/msgstore.go +++ b/lib/msgstore.go @@ -801,11 +801,7 @@ func (store *MessageStore) ModifyLabels(uids []uint32, add, remove []string, } func (store *MessageStore) Sort(criteria []*types.SortCriterion, cb func(types.WorkerMessage)) { - if criteria == nil { - criteria = store.sortCriteria - } else { - store.sortCriteria = criteria - } + store.sortCriteria = criteria store.Sorting = true handle_return := func(msg types.WorkerMessage) { @@ -828,6 +824,10 @@ func (store *MessageStore) Sort(criteria []*types.SortCriterion, cb func(types.W } } +func (store *MessageStore) GetCurrentSortCriteria() []*types.SortCriterion { + return store.sortCriteria +} + // returns the index of needle in haystack or -1 if not found func (store *MessageStore) visualStartIdx() int { for idx, u := range store.Uids() { |