Fix an occasional panic caused by closing the channel before removing…

… it from the list of listeners
mmaelzer · Dec 6, 2015 · 05fb9f7 · 05fb9f7
1 parent 8d40822
commit 05fb9f7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cam.go b/cam.go
@@ -138,7 +138,6 @@ func (cam *Camera) Subscribe() (<-chan Frame, error) {
 func (cam *Camera) Unsubscribe(unsub <-chan Frame) bool {
 	for i, l := range cam.listeners {
 		if unsub == l {
-			close(l)
 			if len(cam.listeners) == 1 {
 				cam.stop()
 				cam.listeners = make([]chan Frame, 0)
@@ -148,6 +147,7 @@ func (cam *Camera) Unsubscribe(unsub <-chan Frame) bool {
 					cam.listeners[i+1:]...,
 				)
 			}
+			close(l)
 			return true
 		}
 	}