Preston_PLB
/
bubbletea
forked from Mirrors/bubbletea
1
0
Fork 0
Code Pull Requests Activity

fix: stop renderer before acquiring renderer mutex

This commit is contained in:
Christian Muehlhaeuser 2023-06-02 12:05:33 +02:00
parent 444e04bbb3
commit 44f17fa1c0
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
standard_renderer.go
View File

@ -88,6 +88,11 @@ func (r *standardRenderer) start() {
// stop permanently halts the renderer, rendering the final frame. // stop permanently halts the renderer, rendering the final frame.
func (r *standardRenderer) stop() { func (r *standardRenderer) stop() {
// Stop the renderer before acquiring the mutex to avoid a deadlock.
r.once.Do(func() {
r.done <- struct{}{}
})
// flush locks the mutex // flush locks the mutex
r.flush() r.flush()
@ -95,9 +100,6 @@ func (r *standardRenderer) stop() {
defer r.mtx.Unlock() defer r.mtx.Unlock()
r.out.ClearLine() r.out.ClearLine()
r.once.Do(func() {
r.done <- struct{}{}
})
if r.useANSICompressor { if r.useANSICompressor {
if w, ok := r.out.TTY().(io.WriteCloser); ok { if w, ok := r.out.TTY().(io.WriteCloser); ok {
@ -108,13 +110,15 @@ func (r *standardRenderer) stop() {
// kill halts the renderer. The final frame will not be rendered. // kill halts the renderer. The final frame will not be rendered.
func (r *standardRenderer) kill() { func (r *standardRenderer) kill() {
// Stop the renderer before acquiring the mutex to avoid a deadlock.
r.once.Do(func() {
r.done <- struct{}{}
})
r.mtx.Lock() r.mtx.Lock()
defer r.mtx.Unlock() defer r.mtx.Unlock()
r.out.ClearLine() r.out.ClearLine()
r.once.Do(func() {
r.done <- struct{}{}
})
} }
// listen waits for ticks on the ticker, or a signal to stop the renderer. // listen waits for ticks on the ticker, or a signal to stop the renderer.