diff --git a/bar.go b/bar.go index 2edac1f..569b548 100644 --- a/bar.go +++ b/bar.go @@ -19,9 +19,9 @@ priority int // used by heap frameCh chan *renderFrame operateState chan func(*bState) - done chan struct{} container *Progress bs *bState + bsOk chan struct{} ctx context.Context cancel func() } @@ -71,7 +71,7 @@ priority: bs.priority, frameCh: make(chan *renderFrame, 1), operateState: make(chan func(*bState)), - done: make(chan struct{}), + bsOk: make(chan struct{}), container: container, ctx: ctx, cancel: cancel, @@ -122,7 +122,7 @@ select { case b.operateState <- func(s *bState) { result <- s.id }: return <-result - case <-b.done: + case <-b.bsOk: return b.bs.id } } @@ -133,7 +133,7 @@ select { case b.operateState <- func(s *bState) { result <- s.current }: return <-result - case <-b.done: + case <-b.bsOk: return b.bs.current } } @@ -352,7 +352,7 @@ select { case b.operateState <- func(s *bState) { result <- s.aborted }: return <-result - case <-b.done: + case <-b.bsOk: return b.bs.aborted } } @@ -363,7 +363,7 @@ select { case b.operateState <- func(s *bState) { result <- s.completed }: return <-result - case <-b.done: + case <-b.bsOk: return b.bs.completed } } @@ -393,7 +393,7 @@ bs.aborted = !bs.completed bs.decoratorShutdownNotify() b.bs = bs - close(b.done) + close(b.bsOk) return } } @@ -427,7 +427,7 @@ } select { case b.operateState <- fn: - case <-b.done: + case <-b.bsOk: fn(b.bs) } } @@ -468,7 +468,7 @@ select { case b.operateState <- func(s *bState) { result <- s.wSyncTable() }: return <-result - case <-b.done: + case <-b.bsOk: return b.bs.wSyncTable() } }