From 07d755df11b7f507662e2cc4b73703eee0923f48 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Sat, 30 Mar 2019 02:06:54 +0900 Subject: [PATCH] Fix regression of prompt display --- src/terminal.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/terminal.go b/src/terminal.go index b4ec69e2..06623b28 100644 --- a/src/terminal.go +++ b/src/terminal.go @@ -1105,6 +1105,7 @@ func (t *Terminal) printAll() { } func (t *Terminal) refresh() { + t.placeCursor() if !t.suppress { windows := make([]tui.Window, 0, 4) if t.bordered { @@ -1452,7 +1453,6 @@ func (t *Terminal) Loop() { t.printPrompt() t.printInfo() t.printHeader() - t.placeCursor() t.refresh() t.mutex.Unlock() go func() { @@ -1623,7 +1623,6 @@ func (t *Terminal) Loop() { exit(func() int { return exitInterrupt }) } } - t.placeCursor() t.refresh() t.mutex.Unlock() }) @@ -1703,7 +1702,7 @@ func (t *Terminal) Loop() { t.previewBox.Set(reqPreviewEnqueue, list) } } - req(reqList, reqInfo, reqHeader) + req(reqPrompt, reqList, reqInfo, reqHeader) } case actTogglePreviewWrap: if t.hasPreviewWindow() { @@ -2012,7 +2011,6 @@ func (t *Terminal) Loop() { t.version++ } } - t.eventBox.Set(EvtSearchNew, t.sort) } if changed || t.cx != previousCx { @@ -2020,6 +2018,10 @@ func (t *Terminal) Loop() { } t.mutex.Unlock() // Must be unlocked before touching reqBox + + if changed { + t.eventBox.Set(EvtSearchNew, t.sort) + } for _, event := range events { t.reqBox.Set(event, nil) }