mirror of
https://github.com/datarhei/core.git
synced 2025-10-05 16:07:07 +08:00
Merge branch 'dev' into vod
This commit is contained in:
@@ -650,6 +650,10 @@ func (p *process) stop(wait bool) error {
|
||||
if p.callbacks.onExit == nil {
|
||||
p.callbacks.onExit = func(string) {
|
||||
wg.Done()
|
||||
|
||||
p.callbacks.lock.Lock()
|
||||
defer p.callbacks.lock.Unlock()
|
||||
|
||||
p.callbacks.onExit = nil
|
||||
}
|
||||
} else {
|
||||
@@ -657,6 +661,10 @@ func (p *process) stop(wait bool) error {
|
||||
p.callbacks.onExit = func(state string) {
|
||||
cb(state)
|
||||
wg.Done()
|
||||
|
||||
p.callbacks.lock.Lock()
|
||||
defer p.callbacks.lock.Unlock()
|
||||
|
||||
p.callbacks.onExit = cb
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user