diff --git a/exec_test.go b/exec_test.go index 0eee4e00..6d23a6ea 100644 --- a/exec_test.go +++ b/exec_test.go @@ -6,6 +6,7 @@ import ( "runtime" "strings" "testing" + "time" ) type execFinishedMsg struct{ err error } @@ -137,6 +138,18 @@ func TestTeaExecWithNilInput(t *testing.T) { } } +func TestReleaseTerminalWithNilInputDoesNotWait(t *testing.T) { + p := NewProgram(&testExecNoInputModel{}, WithInput(nil)) + + start := time.Now() + if err := p.ReleaseTerminal(); err != nil { + t.Fatal(err) + } + if elapsed := time.Since(start); elapsed >= 250*time.Millisecond { + t.Fatalf("ReleaseTerminal took %s without an input reader", elapsed) + } +} + // execLeakModel renders a distinctive marker from View() so a test can detect // whether the renderer flushes the View to stdout when ExecProcess hands the // terminal to a subprocess. Before the fix for #431, the renderer's final diff --git a/tea.go b/tea.go index 340ba74e..a6b01203 100644 --- a/tea.go +++ b/tea.go @@ -1447,10 +1447,9 @@ func (p *Program) releaseTerminal(reset bool) error { atomic.StoreUint32(&p.ignoreSignals, 1) if p.cancelReader != nil { p.cancelReader.Cancel() + p.waitForReadLoop() } - p.waitForReadLoop() - if p.renderer != nil { p.stopRenderer(false) if reset {