mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-28 19:52:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio: Bug fix: Close always returned error

Browse Source
This commit is contained in:
Hajime Hoshi 2019-04-28 02:21:56 +09:00
parent e4f0a0aa04
commit 9fc2ae158c
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
audio/audio.go
View File

@ -341,6 +341,15 @@ func (p *Player) Close() error {
func (p *playerImpl) Close() error { func (p *playerImpl) Close() error {
p.mux.removePlayer(p) p.mux.removePlayer(p)
p.m.Lock()
c := p.closedExplicitly
p.m.Unlock()
if c {
p.m.Unlock()
return fmt.Errorf("audio: the player is already closed")
}
p.m.Lock() p.m.Lock()
p.closedExplicitly = true p.closedExplicitly = true
p.m.Unlock() p.m.Unlock()
@ -365,9 +374,13 @@ func (p *playerImpl) ensureReadLoop() error {
} }
func (p *playerImpl) closeImpl() error { func (p *playerImpl) closeImpl() error {
if err := p.ensureReadLoop(); err != nil { p.m.Lock()
return err r := p.runningReadLoop
p.m.Unlock()
if !r {
return nil
} }
p.closeCh <- struct{}{} p.closeCh <- struct{}{}
<-p.closedCh <-p.closedCh
return nil return nil