diff options
| -rw-r--r-- | widgets/dirlist.go | 13 | ||||
| -rw-r--r-- | worker/notmuch/worker.go | 14 |
2 files changed, 9 insertions, 18 deletions
diff --git a/widgets/dirlist.go b/widgets/dirlist.go index 83001b7b..643be44a 100644 --- a/widgets/dirlist.go +++ b/widgets/dirlist.go @@ -156,12 +156,6 @@ func (dirlist *DirectoryList) Select(name string) { select { case <-time.After(delay): - newStore := true - for _, s := range dirlist.store.List() { - if s == dirlist.selecting { - newStore = false - } - } dirlist.worker.PostAction(&types.OpenDirectory{Directory: name}, func(msg types.WorkerMessage) { switch msg.(type) { @@ -185,13 +179,6 @@ func (dirlist *DirectoryList) Select(name string) { sort.Strings(dirlist.dirs) } dirlist.sortDirsByFoldersSortConfig() - if newStore { - store, ok := dirlist.MsgStore(name) - if ok { - // Fetch directory contents via store.Sort - store.Sort(nil, nil) - } - } } dirlist.Invalidate() }) diff --git a/worker/notmuch/worker.go b/worker/notmuch/worker.go index 2c8cc4f2..1ceaac8d 100644 --- a/worker/notmuch/worker.go +++ b/worker/notmuch/worker.go @@ -249,7 +249,7 @@ func (w *worker) buildDirInfo(name string, query string, skipSort bool) ( } func (w *worker) emitDirectoryInfo(name string) error { - query := w.queryFromName(name) + query, _ := w.queryFromName(name) info, err := w.gatherDirectoryInfo(name, query) if err != nil { return err @@ -260,19 +260,20 @@ func (w *worker) emitDirectoryInfo(name string) error { // queryFromName either returns the friendly ID if aliased or the name itself // assuming it to be the query -func (w *worker) queryFromName(name string) string { +func (w *worker) queryFromName(name string) (string, bool) { // try the friendly name first, if that fails assume it's a query q, ok := w.nameQueryMap[name] if !ok { - return name + return name, true } - return q + return q, false } func (w *worker) handleOpenDirectory(msg *types.OpenDirectory) error { logging.Infof("opening %s", msg.Directory) // try the friendly name first, if that fails assume it's a query - w.query = w.queryFromName(msg.Directory) + var isQuery bool + w.query, isQuery = w.queryFromName(msg.Directory) w.currentQueryName = msg.Directory info, err := w.gatherDirectoryInfo(msg.Directory, w.query) if err != nil { @@ -280,6 +281,9 @@ func (w *worker) handleOpenDirectory(msg *types.OpenDirectory) error { } info.Message = types.RespondTo(msg) w.w.PostMessage(info, nil) + if isQuery { + w.w.PostMessage(info, nil) + } w.done(msg) return nil } |